Bugzilla – Attachment 88104 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] Removing 'all' option, fixing QA tools issues
Bug-14715-QA-Follow-up-Removing-all-option-fixing-.patch (text/plain), 5.51 KB, created by
Liz Rea
on 2019-04-16 19:31:34 UTC
(
hide
)
Description:
Bug 14715: [QA Follow up] Removing 'all' option, fixing QA tools issues
Filename:
MIME Type:
Creator:
Liz Rea
Created:
2019-04-16 19:31:34 UTC
Size:
5.51 KB
patch
obsolete
>From 089da67f328bd550edcfb7eec157469fa2ee9340 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Fri, 20 Oct 2017 00:25:55 +0000 >Subject: [PATCH] Bug 14715: [QA Follow up] Removing 'all' option, fixing QA > tools issues > >Signed-off-by: Simon Pouchol <simon.pouchol@biblibre.com> > >Signed-off-by: Cab Vinton <bibliwho@gmail.com> > >Signed-off-by: Liz Rea <wizzyrea@gmail.com> >--- > C4/Search.pm | 4 ++-- > catalogue/search.pl | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 1 - > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 10 +++++----- > 4 files changed, 8 insertions(+), 9 deletions(-) > >diff --git a/C4/Search.pm b/C4/Search.pm >index 5d3dbb26e5..1b84751df5 100644 >--- a/C4/Search.pm >+++ b/C4/Search.pm >@@ -446,7 +446,7 @@ sub getRecords { > # loop through the results > $results_hash->{'hits'} = $size; > my $times; >- if ( $results_per_page != 'all' && ($offset + $results_per_page <= $size) ) { >+ if ( $offset + $results_per_page <= $size ) { > $times = $offset + $results_per_page; > } > else { >@@ -1898,7 +1898,7 @@ sub searchResults { > > # handle which records to actually retrieve > my $times; >- if ( $hits && $results_per_page != 'all' && ($offset + $results_per_page <= $hits) ) { >+ if ( $hits && ($offset + $results_per_page <= $hits) ) { > $times = $offset + $results_per_page; > } > else { >diff --git a/catalogue/search.pl b/catalogue/search.pl >index e70dac9c51..e45b2e43a9 100755 >--- a/catalogue/search.pl >+++ b/catalogue/search.pl >@@ -627,7 +627,7 @@ for (my $i=0;$i<@servers;$i++) { > if ($query_desc || $limit_desc) { > $template->param(searchdesc => 1); > } >- $template->param(results_per_page => $results_per_page == $hits ? 'all' : $results_per_page); >+ $template->param(results_per_page => $results_per_page); > # must define a value for size if not present in DB > # in order to avoid problems generated by the default size value in TT > foreach my $line (@newresults) { >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 2e03d440c5..43b75fa840 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -86,7 +86,6 @@ > [% 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" /> >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 1db0a053bf..edd66ffa48 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -167,11 +167,11 @@ > > <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> >+ [% 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 %] > </select> > > <input type="submit" class="btn btn-small clearfix" id="sortsubmit" value="Go" /> >-- >2.11.0
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