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 1888-1894 sub searchResults { Link Here
1888
1888
1889
    # handle which records to actually retrieve
1889
    # handle which records to actually retrieve
1890
    my $times;
1890
    my $times;
1891
    if ( $hits && $results_per_page != 'all' && ($offset + $results_per_page <= $hits) ) {
1891
    if ( $hits && ($offset + $results_per_page <= $hits) ) {
1892
        $times = $offset + $results_per_page;
1892
        $times = $offset + $results_per_page;
1893
    }
1893
    }
1894
    else {
1894
    else {
(-)a/catalogue/search.pl (-1 / +1 lines)
Lines 613-619 for (my $i=0;$i<@servers;$i++) { Link Here
613
            if ($query_desc || $limit_desc) {
613
            if ($query_desc || $limit_desc) {
614
                $template->param(searchdesc => 1);
614
                $template->param(searchdesc => 1);
615
            }
615
            }
616
            $template->param(results_per_page =>  $results_per_page == $hits ? 'all' : $results_per_page);
616
            $template->param(results_per_page =>  $results_per_page);
617
            # must define a value for size if not present in DB
617
            # must define a value for size if not present in DB
618
            # in order to avoid problems generated by the default size value in TT
618
            # in order to avoid problems generated by the default size value in TT
619
            foreach my $line (@newresults) {
619
            foreach my $line (@newresults) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-1 lines)
Lines 82-88 Link Here
82
                        [% IF results_per_page == '60' %]<option value="60" selected="selected">60</option>[% ELSE %]<option value="60">60</option>[% END %]
82
                        [% IF results_per_page == '60' %]<option value="60" selected="selected">60</option>[% ELSE %]<option value="60">60</option>[% END %]
83
                        [% IF results_per_page == '80' %]<option value="80" selected="selected">80</option>[% ELSE %]<option value="80">80</option>[% END %]
83
                        [% IF results_per_page == '80' %]<option value="80" selected="selected">80</option>[% ELSE %]<option value="80">80</option>[% END %]
84
                        [% IF results_per_page == '100' %]<option value="100" selected="selected">100</option>[% ELSE %]<option value="100">100</option>[% END %]
84
                        [% IF results_per_page == '100' %]<option value="100" selected="selected">100</option>[% ELSE %]<option value="100">100</option>[% END %]
85
                        [% IF results_per_page == 'all' %]<option value="all" selected="selected">all</option>[% ELSE %]<option value="all">all</option>[% END %]
86
                    </select>
85
                    </select>
87
                <!-- RESULTS_PER_PAGE END -->
86
                <!-- RESULTS_PER_PAGE END -->
88
                    <input type="submit" value="Go" />
87
                    <input type="submit" value="Go" />
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-6 / +5 lines)
Lines 149-159 Link Here
149
149
150
                                            <label for="results_per_page">Results per page: </label>
150
                                            <label for="results_per_page">Results per page: </label>
151
                                            <select id="results_per_page" name="results_per_page">
151
                                            <select id="results_per_page" name="results_per_page">
152
                                                <option value="20" [% 'SELECTED' IF results_per_page == '20' %]>20</option>
152
                                                [% IF results_per_page == '20' %]<option value="20" selected="selected">20</option>[% ELSE %]<option value="20">20</option>[% END %]
153
                                                <option value="40" [% 'SELECTED' IF results_per_page == '40' %]>40</option>
153
                                                [% IF results_per_page == '40' %]<option value="40" selected="selected">40</option>[% ELSE %]<option value="40">40</option>[% END %]
154
                                                <option value="60" [% 'SELECTED' IF results_per_page == '60' %]>60</option>
154
                                                [% IF results_per_page == '60' %]<option value="60" selected="selected">60</option>[% ELSE %]<option value="60">60</option>[% END %]
155
                                                <option value="80" [% 'SELECTED' IF results_per_page == '80' %]>80</option>
155
                                                [% IF results_per_page == '80' %]<option value="80" selected="selected">80</option>[% ELSE %]<option value="80">80</option>[% END %]
156
                                                <option value="100" [% 'SELECTED' IF results_per_page == '100' %]>100</option>
156
                                                [% IF results_per_page == '100' %]<option value="100" selected="selected">100</option>[% ELSE %]<option value="100">100</option>[% END %]
157
                                            </select>
157
                                            </select>
158
158
159
                                            <input type="submit" class="btn btn-small clearfix" id="sortsubmit" value="Go" />
159
                                            <input type="submit" class="btn btn-small clearfix" id="sortsubmit" value="Go" />
160
- 

Return to bug 14715