Bugzilla – Attachment 88838 Details for
Bug 14715
Results per page setting for catalog search in staff client and OPAC
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14715: (QA Follow up) More QA tool cleanup
Bug-14715-QA-Follow-up-More-QA-tool-cleanup.patch (text/plain), 6.77 KB, created by
Aleisha Amohia
on 2019-04-26 02:39:07 UTC
(
hide
)
Description:
Bug 14715: (QA Follow up) More QA tool cleanup
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2019-04-26 02:39:07 UTC
Size:
6.77 KB
patch
obsolete
>From 0249325a6b25389cc70d7c53cfc2e32f3c3d0262 Mon Sep 17 00:00:00 2001 >From: Liz Rea <wizzyrea@gmail.com> >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 <wizzyrea@gmail.com> >--- > .../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 @@ > </select> > <!-- RESORT END --> > <!-- RESULTS_PER_PAGE START --> >- [% IF Koha.Preference('SearchEngine') eq "Zebra" && Koha.Preference('numSearchResultsDropdown') %] >+ [% IF Koha.Preference('SearchEngine') == "Zebra" && Koha.Preference('numSearchResultsDropdown') %] > <label for="results_per_page">Results per page: </label> > <select id="results_per_page" name="results_per_page"> >- [% IF Koha.Preference('numSearchResults') %]<option value="[% Koha.Preference('numSearchResults') %]" selected="selected">Library default: [% Koha.Preference('numSearchResults') %]</option>[% ELSE %]<option value="[% Koha.Preference('numSearchResults') %]">Library default: [% Koha.Preference('numSearchResults') %]</option>[% END %] >+ [% IF Koha.Preference('numSearchResults') %]<option value="[% Koha.Preference('numSearchResults') | html %]" selected="selected">Library default: [% Koha.Preference('numSearchResults') | html %]</option>[% ELSE %]<option value="[% Koha.Preference('numSearchResults') | html %]">Library default: [% Koha.Preference('numSearchResults') | html %]</option>[% END %] > [% IF results_per_page == '20' %]<option value="20" selected="selected">20</option>[% ELSE %]<option value="20">20</option>[% END %] > [% IF results_per_page == '40' %]<option value="40" selected="selected">40</option>[% ELSE %]<option value="40">40</option>[% END %] > [% IF results_per_page == '60' %]<option value="60" selected="selected">60</option>[% ELSE %]<option value="60">60</option>[% END %] >@@ -94,7 +94,7 @@ > <input type="submit" value="Go" /> > </form> > <h3> >- [% total %] result(s) found [% IF ( query_desc ) %]for <span style="font-weight: bold;">'[% query_desc |html %]'</span>[% END %][% IF limit_desc %] with limit(s): <span style="font-weight: bold;">'[% limit_desc | html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName %] Catalog[% END %].<br /> >+ [% total | html %] result(s) found [% IF ( query_desc ) %]for <span style="font-weight: bold;">'[% query_desc |html %]'</span>[% END %][% IF limit_desc %] with limit(s): <span style="font-weight: bold;">'[% limit_desc | html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName | html %] Catalog[% END %].<br /> > </h3> > <a href="#" id="select_all"><i class="fa fa-check"></i> Select all</a> > | >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 %] > <div class="sort_by pull-right"> > <select id="sort_by" class="resort" name="sort_by"> [% INCLUDE 'resort_form.inc' %] </select> >- [% IF Koha.Preference('SearchEngine') eq "Zebra" && Koha.Preference('OPACnumSearchResultsDropdown') %] >+ [% IF Koha.Preference('SearchEngine') == "Zebra" && Koha.Preference('OPACnumSearchResultsDropdown') %] > <label for="results_per_page">Results per page: </label> > <select id="results_per_page" name="results_per_page"> >- [% IF Koha.Preference('OPACnumSearchResults') %]<option value="[% Koha.Preference('OPACnumSearchResults') %]" selected="selected">Library default: [% Koha.Preference('OPACnumSearchResults') %]</option>[% ELSE %]<option value="[% Koha.Preference('OPACnumSearchResults') %]">Library default: [% Koha.Preference('OPACnumSearchResults') %]</option>[% END %] >+ [% IF Koha.Preference('OPACnumSearchResults') %]<option value="[% Koha.Preference('OPACnumSearchResults') | html %]" selected="selected">Library default: [% Koha.Preference('OPACnumSearchResults') | html %]</option>[% ELSE %]<option value="[% Koha.Preference('OPACnumSearchResults') | html %]">Library default: [% Koha.Preference('OPACnumSearchResults') | html %]</option>[% END %] > [% IF results_per_page == '20' %]<option value="20" selected="selected">20</option>[% ELSE %]<option value="20">20</option>[% END %] > [% IF results_per_page == '40' %]<option value="40" selected="selected">40</option>[% ELSE %]<option value="40">40</option>[% END %] > [% IF results_per_page == '60' %]<option value="60" selected="selected">60</option>[% ELSE %]<option value="60">60</option>[% END %] >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14715
:
41949
|
42003
|
42742
|
42743
|
56002
|
56003
|
56004
|
56005
|
56575
|
56576
|
56577
|
56610
|
56611
|
56612
|
57870
|
61721
|
64250
|
67912
|
67913
|
68000
|
68001
|
68305
|
68327
|
75938
|
75939
|
75940
|
75941
|
78230
|
78298
|
78299
|
78300
|
78301
|
78302
|
79796
|
79797
|
79988
|
81203
|
88097
|
88102
|
88103
|
88104
|
88105
|
88106
|
88107
|
88108
|
88109
|
88126
|
88195
|
88831
|
88832
|
88833
|
88834
|
88835
|
88836
|
88837
|
88838
|
88839
|
95038
|
97004
|
98365
|
99607
|
99677
|
99684
|
99685
|
101775
|
101776
|
101777
|
101778