[4.3] Guided Tours search by note

[joomlapl-bot]

PR w związku ze zmianą oryginału https://github.com/joomla/joomla-cms/pull/40607 Poniżej zmiany w oryginale:

Click to expand the diff!

```diff diff --git a/administrator/components/com_guidedtours/src/Model/StepsModel.php b/administrator/components/com_guidedtours/src/Model/StepsModel.php index 14c6c3584070a..134721e5756d9 100644 --- a/administrator/components/com_guidedtours/src/Model/StepsModel.php +++ b/administrator/components/com_guidedtours/src/Model/StepsModel.php @@ -50,6 +50,7 @@ public function __construct($config = []) 'created_by', 'a.created_by', 'modified', 'a.modified', 'modified_by', 'a.modified_by', + 'note', 'a.note', ]; } @@ -200,9 +201,10 @@ protected function getListQuery() $search = '%' . str_replace(' ', '%', trim($search)) . '%'; $query->where( '(' . $db->quoteName('a.title') . ' LIKE :search1' - . ' OR ' . $db->quoteName('a.description') . ' LIKE :search2)' + . ' OR ' . $db->quoteName('a.description') . ' LIKE :search2' + . ' OR ' . $db->quoteName('a.note') . ' LIKE :search3)' ) - ->bind([':search1', ':search2'], $search); + ->bind([':search1', ':search2', ':search3'], $search); } } diff --git a/administrator/components/com_guidedtours/src/Model/ToursModel.php b/administrator/components/com_guidedtours/src/Model/ToursModel.php index 2ee0df9df3953..3850090ca947a 100644 --- a/administrator/components/com_guidedtours/src/Model/ToursModel.php +++ b/administrator/components/com_guidedtours/src/Model/ToursModel.php @@ -51,6 +51,7 @@ public function __construct($config = []) 'created_by', 'a.created_by', 'modified', 'a.modified', 'modified_by', 'a.modified_by', + 'note', 'a.note', ]; } @@ -220,9 +221,10 @@ public function getListQuery() $search = '%' . str_replace(' ', '%', trim($search)) . '%'; $query->where( '(' . $db->quoteName('a.title') . ' LIKE :search1' - . ' OR ' . $db->quoteName('a.description') . ' LIKE :search2)' + . ' OR ' . $db->quoteName('a.description') . ' LIKE :search2' + . ' OR ' . $db->quoteName('a.note') . ' LIKE :search3)' ) - ->bind([':search1', ':search2'], $search); + ->bind([':search1', ':search2', ':search3'], $search); } } diff --git a/administrator/language/en-GB/com_guidedtours.ini b/administrator/language/en-GB/com_guidedtours.ini index 76e37e496ba9f..a201bc70e1984 100644 --- a/administrator/language/en-GB/com_guidedtours.ini +++ b/administrator/language/en-GB/com_guidedtours.ini @@ -20,7 +20,7 @@ COM_GUIDEDTOURS_FIELD_VALUE_INTERACTIVESTEP_TYPE_TEXT_FIELD="Text Field" COM_GUIDEDTOURS_FIELD_VALUE_STEP_TYPE_INTERACTIVE="Interactive" COM_GUIDEDTOURS_FIELD_VALUE_STEP_TYPE_NEXT="Next" COM_GUIDEDTOURS_FIELD_VALUE_STEP_TYPE_REDIRECT="Redirect" -COM_GUIDEDTOURS_FILTER_SEARCH_DESC="Search in title. Prefix with ID: to search for a tour ID or DESCRIPTION: to search in description." +COM_GUIDEDTOURS_FILTER_SEARCH_DESC="Search in title and note. Prefix with ID: to search for a tour ID or DESCRIPTION: to search in description." COM_GUIDEDTOURS_FILTER_SEARCH_LABEL="Search Tours" COM_GUIDEDTOURS_GUIDEDTOURS_TABLE_CAPTION="Tours" COM_GUIDEDTOURS_MANAGER_STEP_EDIT="Guided Tours: Edit Step" @@ -44,7 +44,7 @@ COM_GUIDEDTOURS_ORDER_TYPE_ASC="Type ascending" COM_GUIDEDTOURS_ORDER_TYPE_DESC="Type descending" COM_GUIDEDTOURS_STEP_DESCRIPTION_TRANSLATION="Description (%s)" COM_GUIDEDTOURS_STEP_EDIT_STEP="Edit Step" -COM_GUIDEDTOURS_STEP_FILTER_SEARCH_DESC="Search in title. Prefix with ID: to search for a step ID or DESCRIPTION: to search in description." +COM_GUIDEDTOURS_STEP_FILTER_SEARCH_DESC="Search in title and note. Prefix with ID: to search for a step ID or DESCRIPTION: to search in description." COM_GUIDEDTOURS_STEP_FILTER_SEARCH_LABEL="Search Steps" COM_GUIDEDTOURS_STEP_NEW_STEP="New Step" COM_GUIDEDTOURS_STEP_POSITION_DESC="Select the position of the step popup, relative to the element it points to." ```