From 0249325a6b25389cc70d7c53cfc2e32f3c3d0262 Mon Sep 17 00:00:00 2001 From: Liz Rea Date: Tue, 16 Apr 2019 10:23:19 +0000 Subject: [PATCH] Bug 14715: (QA Follow up) More QA tool cleanup Tools are picking up more stuff now, so a few more things to fix! Signed-off-by: Liz Rea --- .../atomicupdate/bug_14715_-_results_per_page_dropdown_sysprefs.sql | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_14715_-_results_per_page_dropdown_sysprefs.sql b/installer/data/mysql/atomicupdate/bug_14715_-_results_per_page_dropdown_sysprefs.sql index ef97362..5b98e89 100644 --- a/installer/data/mysql/atomicupdate/bug_14715_-_results_per_page_dropdown_sysprefs.sql +++ b/installer/data/mysql/atomicupdate/bug_14715_-_results_per_page_dropdown_sysprefs.sql @@ -1,3 +1,3 @@ INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES ('OPACnumSearchResultsDropdown', 0, NULL, 'Option list of number of results per page to show in OPAC search results','YesNo'), -('numSearchResultsDropdown', 0, NULL, 'Option list of number of results per page to show in staff client search results','YesNo'); +('numSearchResultsDropdown', 0, NULL, 'Option list of number of results per page to show in staff client search results','YesNo') 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 29ee9cd..80105ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -79,10 +79,10 @@ - [% IF Koha.Preference('SearchEngine') eq "Zebra" && Koha.Preference('numSearchResultsDropdown') %] + [% IF Koha.Preference('SearchEngine') == "Zebra" && Koha.Preference('numSearchResultsDropdown') %]

- [% total %] result(s) found [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF limit_desc %] with limit(s): '[% limit_desc | html %]'[% END %][% IF ( LibraryName ) %] in [% LibraryName %] Catalog[% END %].
  + [% total | html %] result(s) found [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF limit_desc %] with limit(s): '[% limit_desc | html %]'[% END %][% IF ( LibraryName ) %] in [% LibraryName | html %] Catalog[% END %].
 

Select all | diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index b859a2d..ac46bca 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -164,10 +164,10 @@ [% UNLESS tag %]
- [% IF Koha.Preference('SearchEngine') eq "Zebra" && Koha.Preference('OPACnumSearchResultsDropdown') %] + [% IF Koha.Preference('SearchEngine') == "Zebra" && Koha.Preference('OPACnumSearchResultsDropdown') %]