@@ -, +, @@
tools issues
---
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(-)
--- a/C4/Search.pm
+++ a/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 {
--- a/catalogue/search.pl
+++ a/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) {
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -86,7 +86,6 @@
[% IF results_per_page == '60' %][% ELSE %][% END %]
[% IF results_per_page == '80' %][% ELSE %][% END %]
[% IF results_per_page == '100' %][% ELSE %][% END %]
- [% IF results_per_page == 'all' %][% ELSE %][% END %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -167,11 +167,11 @@
--