View | Details | Raw Unified | Return to bug 14715
Collapse All | Expand All

(-)a/C4/Search.pm (-2 / +2 lines)
Lines 446-452 sub getRecords { Link Here
446
                # loop through the results
446
                # loop through the results
447
                $results_hash->{'hits'} = $size;
447
                $results_hash->{'hits'} = $size;
448
                my $times;
448
                my $times;
449
                if ( $results_per_page != 'all' && ($offset + $results_per_page <= $size) ) {
449
                if ( $offset + $results_per_page <= $size ) {
450
                    $times = $offset + $results_per_page;
450
                    $times = $offset + $results_per_page;
451
                }
451
                }
452
                else {
452
                else {
Lines 1898-1904 sub searchResults { Link Here
1898
1898
1899
    # handle which records to actually retrieve
1899
    # handle which records to actually retrieve
1900
    my $times;
1900
    my $times;
1901
    if ( $hits && $results_per_page != 'all' && ($offset + $results_per_page <= $hits) ) {
1901
    if ( $hits && ($offset + $results_per_page <= $hits) ) {
1902
        $times = $offset + $results_per_page;
1902
        $times = $offset + $results_per_page;
1903
    }
1903
    }
1904
    else {
1904
    else {
(-)a/catalogue/search.pl (-1 / +1 lines)
Lines 627-633 for (my $i=0;$i<@servers;$i++) { Link Here
627
            if ($query_desc || $limit_desc) {
627
            if ($query_desc || $limit_desc) {
628
                $template->param(searchdesc => 1);
628
                $template->param(searchdesc => 1);
629
            }
629
            }
630
            $template->param(results_per_page =>  $results_per_page == $hits ? 'all' : $results_per_page);
630
            $template->param(results_per_page =>  $results_per_page);
631
            # must define a value for size if not present in DB
631
            # must define a value for size if not present in DB
632
            # in order to avoid problems generated by the default size value in TT
632
            # in order to avoid problems generated by the default size value in TT
633
            foreach my $line (@newresults) {
633
            foreach my $line (@newresults) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-1 lines)
Lines 87-93 Link Here
87
                        [% IF results_per_page == '60' %]<option value="60" selected="selected">60</option>[% ELSE %]<option value="60">60</option>[% END %]
87
                        [% IF results_per_page == '60' %]<option value="60" selected="selected">60</option>[% ELSE %]<option value="60">60</option>[% END %]
88
                        [% IF results_per_page == '80' %]<option value="80" selected="selected">80</option>[% ELSE %]<option value="80">80</option>[% END %]
88
                        [% IF results_per_page == '80' %]<option value="80" selected="selected">80</option>[% ELSE %]<option value="80">80</option>[% END %]
89
                        [% IF results_per_page == '100' %]<option value="100" selected="selected">100</option>[% ELSE %]<option value="100">100</option>[% END %]
89
                        [% IF results_per_page == '100' %]<option value="100" selected="selected">100</option>[% ELSE %]<option value="100">100</option>[% END %]
90
                        [% IF results_per_page == 'all' %]<option value="all" selected="selected">all</option>[% ELSE %]<option value="all">all</option>[% END %]
91
                    </select>
90
                    </select>
92
                <!-- RESULTS_PER_PAGE END -->
91
                <!-- RESULTS_PER_PAGE END -->
93
                    <input type="submit" value="Go" />
92
                    <input type="submit" value="Go" />
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-6 / +5 lines)
Lines 167-177 Link Here
167
167
168
                                            <label for="results_per_page">Results per page: </label>
168
                                            <label for="results_per_page">Results per page: </label>
169
                                            <select id="results_per_page" name="results_per_page">
169
                                            <select id="results_per_page" name="results_per_page">
170
                                                <option value="20" [% 'SELECTED' IF results_per_page == '20' %]>20</option>
170
                                                [% IF results_per_page == '20' %]<option value="20" selected="selected">20</option>[% ELSE %]<option value="20">20</option>[% END %]
171
                                                <option value="40" [% 'SELECTED' IF results_per_page == '40' %]>40</option>
171
                                                [% IF results_per_page == '40' %]<option value="40" selected="selected">40</option>[% ELSE %]<option value="40">40</option>[% END %]
172
                                                <option value="60" [% 'SELECTED' IF results_per_page == '60' %]>60</option>
172
                                                [% IF results_per_page == '60' %]<option value="60" selected="selected">60</option>[% ELSE %]<option value="60">60</option>[% END %]
173
                                                <option value="80" [% 'SELECTED' IF results_per_page == '80' %]>80</option>
173
                                                [% IF results_per_page == '80' %]<option value="80" selected="selected">80</option>[% ELSE %]<option value="80">80</option>[% END %]
174
                                                <option value="100" [% 'SELECTED' IF results_per_page == '100' %]>100</option>
174
                                                [% IF results_per_page == '100' %]<option value="100" selected="selected">100</option>[% ELSE %]<option value="100">100</option>[% END %]
175
                                            </select>
175
                                            </select>
176
176
177
                                            <input type="submit" class="btn btn-small clearfix" id="sortsubmit" value="Go" />
177
                                            <input type="submit" class="btn btn-small clearfix" id="sortsubmit" value="Go" />
178
- 

Return to bug 14715