From a9437e825eb60eb19fa658cd1f6da5a15ab04de1 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Fri, 5 Oct 2018 02:03:18 +0000 Subject: [PATCH] Bug 14715: (QA follow-up) Edits for ElasticSearch Note added to preferences that the dropdown should not be used with ElasticSearch activated. Dropdowns do not show on search results on staff side or OPAC side if Elasticsearch enabled. Ready to test Signed-off-by: Liz Rea --- .../intranet-tmpl/prog/en/modules/admin/preferences/searching.pref | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref index 6999b7e334..4bf0f66327 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref @@ -139,6 +139,7 @@ Searching: yes: Show no: "Don't show" - results per page dropdown on staff client search results. + - "Note: This does not work if ElasticSearch is activated." - - pref: OPACnumSearchResultsDropdown type: boolean @@ -147,6 +148,7 @@ Searching: yes: Show no: "Don't show" - results per page dropdown on OPAC search results. + - "Note: This does not work if ElasticSearch is activated." - - By default, sort search results in the staff client by - pref: defaultSortField diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 55ae1c4b71..cbb13f5211 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -78,7 +78,7 @@ - [% IF Koha.Preference('numSearchResultsDropdown') %] + [% IF Koha.Preference('SearchEngine') eq "Zebra" && Koha.Preference('numSearchResultsDropdown') %] [% INCLUDE 'resort_form.inc' %] - [% IF Koha.Preference('OPACnumSearchResultsDropdown') %] + [% IF Koha.Preference('SearchEngine') eq "Zebra" && Koha.Preference('OPACnumSearchResultsDropdown') %]