Bugzilla – Attachment 68001 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: [FOLLOW-UP] Fixing qa-tools issues
Bug-14715-FOLLOW-UP-Fixing-qa-tools-issues.patch (text/plain), 4.50 KB, created by
Owen Leonard
on 2017-10-12 13:17:43 UTC
(
hide
)
Description:
Bug 14715: [FOLLOW-UP] Fixing qa-tools issues
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2017-10-12 13:17:43 UTC
Size:
4.50 KB
patch
obsolete
>From 9c691e4a2f5647cc70befaac15f781b51bcb4bb3 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Tue, 13 Jun 2017 04:50:11 +0000 >Subject: [PATCH] Bug 14715: [FOLLOW-UP] Fixing qa-tools issues > >and merge conflicts > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > >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 3a12afb..7647d53 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -109,9 +109,10 @@ $('#results_per_page').change(function() { > [% IF ( intranetbookbag ) %] param1 += "<option value=\"addtocart\">"+_("Cart")+"<\/option>"; [% END %] > > [% IF Koha.Preference('virtualshelves') %] >+ [% SET number_of_private_shelves = 0 %] >+ [% SET number_of_public_shelves = 0 %] > [% IF add_to_some_private_shelves.count %] > param1 += "<optgroup label=\""+_("Your lists:")+"\">"; >- [% SET number_of_private_shelves = 0 %] > [% FOREACH s IN add_to_some_private_shelves %] > [% IF shelfnumber != s.shelfnumber %] > param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname |html %]<\/option>"; >@@ -123,7 +124,6 @@ $('#results_per_page').change(function() { > [% END %] > [% IF add_to_some_public_shelves.count %] > param1 += "<optgroup label=\""+_("Public lists:")+"\">"; >- [% SET number_of_public_shelves = 0 %] > [% FOREACH s IN add_to_some_public_shelves %] > [% IF shelfnumber != s.shelfnumber %] > param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname |html %]<\/option>"; >@@ -133,7 +133,7 @@ $('#results_per_page').change(function() { > [% END %] > param1 += "<\/optgroup>"; > [% END %] >- [% IF ( add_to_some_private_shelves and add_to_some_private_shelves.count > 10 ) or ( add_to_some_public_shelves and add_to_some_public_shelves.count > 10 ) %] >+ [% IF ( number_of_private_shelves > 10 || number_of_public_shelves > 10 ) %] > param1 += "<option value=\"morelists\">[ "+_("More lists")+" ]<\/option>"; > [% END %] > param1 +="<option value=\"newlist\">"+_("[ New list ]")+"<\/option>" >@@ -366,12 +366,12 @@ var holdForPatron = function () { > <!-- RESULTS_PER_PAGE START --> > <label for="results_per_page">Results per page: </label> > <select id="results_per_page" name="results_per_page"> >- <option value="20" [% 'SELECTED' IF results_per_page == '20' %]>20</option> >- <option value="40" [% 'SELECTED' IF results_per_page == '40' %]>40</option> >- <option value="60" [% 'SELECTED' IF results_per_page == '60' %]>60</option> >- <option value="80" [% 'SELECTED' IF results_per_page == '80' %]>80</option> >- <option value="100" [% 'SELECTED' IF results_per_page == '100' %]>100</option> >- <option value="all" [% 'SELECTED' IF results_per_page == 'all' %]>all</option> >+ [% 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 %] >+ [% IF results_per_page == '80' %]<option value="80" selected="selected">80</option>[% ELSE %]<option value="80">80</option>[% END %] >+ [% IF results_per_page == '100' %]<option value="100" selected="selected">100</option>[% ELSE %]<option value="100">100</option>[% END %] >+ [% IF results_per_page == 'all' %]<option value="all" selected="selected">all</option>[% ELSE %]<option value="all">all</option>[% END %] > </select> > <!-- RESULTS_PER_PAGE END --> > <input type="submit" value="Go" /> >-- >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