Skip to content

[4.3] Guided Tours search by note #40607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
obuisard merged 5 commits into from
Jun 19, 2023
Merged

[4.3] Guided Tours search by note #40607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17a4348
[4.3] Guided Tours search by note
brianteeman May 16, 2023
17bf4bf
language string
brianteeman May 16, 2023
7261b33
Merge branch '4.3-dev' into guidednote
QuyTon Jun 12, 2023
984e77b
Merge branch '4.3-dev' into guidednote
QuyTon Jun 12, 2023
bbcfef4
Merge branch '4.3-dev' into guidednote
obuisard Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions administrator/components/com_guidedtours/src/Model/StepsModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public function __construct($config = [])
'created_by', 'a.created_by',
'modified', 'a.modified',
'modified_by', 'a.modified_by',
'note', 'a.note',
];
}

Expand Down Expand Up @@ -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);
}
}

Expand Down
6 changes: 4 additions & 2 deletions administrator/components/com_guidedtours/src/Model/ToursModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public function __construct($config = [])
'created_by', 'a.created_by',
'modified', 'a.modified',
'modified_by', 'a.modified_by',
'note', 'a.note',
];
}

Expand Down Expand Up @@ -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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions administrator/language/en-GB/com_guidedtours.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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."
Expand Down