From 588e53b346a21ef3faa9cfff8ad13006ef9612cb Mon Sep 17 00:00:00 2001 From: yild Date: Sat, 11 Jun 2016 22:06:36 +0200 Subject: [PATCH 1/5] Update en-GB.com_attachments.ini --- .../admin/language/en-GB/en-GB.com_attachments.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/attachments_component/admin/language/en-GB/en-GB.com_attachments.ini b/attachments_component/admin/language/en-GB/en-GB.com_attachments.ini index 90c1718e..beb45c27 100644 --- a/attachments_component/admin/language/en-GB/en-GB.com_attachments.ini +++ b/attachments_component/admin/language/en-GB/en-GB.com_attachments.ini @@ -378,3 +378,8 @@ COM_ATTACHMENTS_N_ITEMS_PUBLISHED="%d Attachments successfully published" COM_ATTACHMENTS_N_ITEMS_PUBLISHED_1="Attachment successfully published" COM_ATTACHMENTS_N_ITEMS_UNPUBLISHED="%d Attachments successfully unpublished" COM_ATTACHMENTS_N_ITEMS_UNPUBLISHED_1="Attachment successfully unpublished" + +ATTACH_ALTERNATIVE_SEARCH_RESULTS="Alternative search results format" +ATTACH_ALTERNATIVE_SEARCH_RESULTS_DESC="Switch to alternative search results format for searching attachments - create links to content to which attachment is connected, keep attachment detail information in result" +ATTACH_HIDE_BRACKETS_IF_EMPTY="Hide brackets when empty" +ATTACH_HIDE_BRACKETS_IF_EMPTY_DESCRIPTION="Hide brackets when there is no value in 'description' or user defined fields" From 649504b8fb27df2d9c27d8b9b26e62f080b27f61 Mon Sep 17 00:00:00 2001 From: yild Date: Sat, 11 Jun 2016 22:09:45 +0200 Subject: [PATCH 2/5] Update config.xml --- attachments_component/admin/config.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/attachments_component/admin/config.xml b/attachments_component/admin/config.xml index a2ecbf96..d26d9b01 100644 --- a/attachments_component/admin/config.xml +++ b/attachments_component/admin/config.xml @@ -65,6 +65,13 @@ + + + + + @@ -224,7 +231,12 @@ label="ATTACH_URL_TO_REGISTER" size="65" description="ATTACH_URL_TO_REGISTER_DESCRIPTION"> - + + + +
Date: Sat, 11 Jun 2016 22:14:52 +0200 Subject: [PATCH 3/5] Update default.php --- .../site/views/attachments/tmpl/default.php | 43 +++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/attachments_component/site/views/attachments/tmpl/default.php b/attachments_component/site/views/attachments/tmpl/default.php index 88e9fa5b..38323f23 100644 --- a/attachments_component/site/views/attachments/tmpl/default.php +++ b/attachments_component/site/views/attachments/tmpl/default.php @@ -222,41 +222,68 @@ // Add description (maybe) if ( $this->show_description ) { $description = htmlspecialchars(stripslashes($attachment->description)); - if ( JString::strlen($description) == 0) + $is_empty = 0; + if ( JString::strlen($description) == 0) { $description = ' '; + $is_empty = 1; + } + if ( $this->show_column_titles ) $html .= "$description"; else - $html .= "[$description]"; + if ($is_empty && $this->params->get('hide_brackets_if_empty')) + $html .= "$description"; + else + $html .= "[$description]"; } // Show the USER DEFINED FIELDs (maybe) if ( $this->show_user_field_1 ) { $user_field = stripslashes($attachment->user_field_1); - if ( JString::strlen($user_field) == 0 ) + $is_empty = 0; + if ( JString::strlen($user_field) == 0 ) { $user_field = ' '; + $is_empty = 1; + } + if ( $this->show_column_titles ) $html .= "" . $user_field . ""; else - $html .= "[" . $user_field . "]"; + if ($is_empty && $this->params->get('hide_brackets_if_empty')) + $html .= "" . $user_field . ""; + else + $html .= "[" . $user_field . "]"; } if ( $this->show_user_field_2 ) { $user_field = stripslashes($attachment->user_field_2); - if ( JString::strlen($user_field) == 0 ) + if ( JString::strlen($user_field) == 0 ) { $user_field = ' '; + $is_empty = 1; + } + if ( $this->show_column_titles ) $html .= "" . $user_field . ""; else - $html .= "[" . $user_field . "]"; + if ($is_empty && $this->params->get('hide_brackets_if_empty')) + $html .= "" . $user_field . ""; + else + $html .= "[" . $user_field . "]"; } if ( $this->show_user_field_3 ) { $user_field = stripslashes($attachment->user_field_3); - if ( JString::strlen($user_field) == 0 ) + $is_empty = 0; + if ( JString::strlen($user_field) == 0 ) { $user_field = ' '; + $is_empty = 1; + } + if ( $this->show_column_titles ) $html .= "" . $user_field . ""; else - $html .= "[" . $user_field . "]"; + if ($is_empty && $this->params->get('hide_brackets_if_empty')) + $html .= "" . $user_field . ""; + else + $html .= "[" . $user_field . "]"; } // Add the creator's username (if requested) From 3dc1b368f178b70e4a9de8e66c9e90c15d6ccc35 Mon Sep 17 00:00:00 2001 From: yild Date: Sat, 11 Jun 2016 22:19:44 +0200 Subject: [PATCH 4/5] Update attachments.php --- attachments_search/attachments.php | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/attachments_search/attachments.php b/attachments_search/attachments.php index b873062c..d303ae50 100644 --- a/attachments_search/attachments.php +++ b/attachments_search/attachments.php @@ -169,7 +169,10 @@ public function onContentSearch($text, $phrase='', $ordering='', $areas=null) // Construct and execute the query $query = $db->getQuery(true); - $query->select('*')->from('#__attachments AS a'); + if ($attachParams->get('alternative_search_results', 0)) + $query->select('a.*, c.alias, c.catid')->from('#__attachments AS a')->join('LEFT', '#__content AS c ON a.parent_id = c.id'); + else + $query->select('*')->from('#__attachments AS a'); $query->where("( $where ) AND a.state = 1"); if ( !$user->authorise('core.admin') ) { $query->where('a.access in ('.$user_levels.')'); @@ -273,8 +276,26 @@ public function onContentSearch($text, $phrase='', $ordering='', $areas=null) $parent_title = JText::_($parent->getTitle($attachment->parent_id, $parent_entity)); - $attachment->section = JText::sprintf('ATTACH_ATTACHED_TO_PARENT_S_TITLE_S', + if ($attachParams->get('alternative_search_results', 0)) + $attachment->section = ''; + else + $attachment->section = JText::sprintf('ATTACH_ATTACHED_TO_PARENT_S_TITLE_S', $parent_entity_name, $parent_title); + + if ($attachParams->get('alternative_search_results', 0)) { + + $url = ''; + switch($attachment->parent_entity) { + case 'category': + $url = ContentHelperRoute::getCategoryRoute($attachment->catid.':'.$attachment->alias); + break; + default: // case 'article': + $url = ContentHelperRoute::getArticleRoute( $attachment->parent_id.':'.$attachment->alias, $attachment->catid); + } + $attachment->href = $url; + $attachment->title = $attachment->parent_title; + + } $results[$k] = $attachment; $k++; From da9aee934e073fd60e3ee35a5128f9d8faac8b2e Mon Sep 17 00:00:00 2001 From: Yild Date: Wed, 8 Feb 2023 00:07:23 +0100 Subject: [PATCH 5/5] intial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..10a1137f --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +Initial commit - prepare Attachments plugin to work with Joomla 4. +