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

(-)a/catalogue/search.pl (+10 lines)
Lines 150-155 use C4::Members qw(GetMember); Link Here
150
use C4::VirtualShelves;
150
use C4::VirtualShelves;
151
use URI::Escape;
151
use URI::Escape;
152
use POSIX qw(ceil floor);
152
use POSIX qw(ceil floor);
153
use String::Random;
153
use C4::Branch; # GetBranches
154
use C4::Branch; # GetBranches
154
use C4::Search::History;
155
use C4::Search::History;
155
156
Lines 473-478 for (my $ii = 0; $ii < @operands; ++$ii) Link Here
473
# Params that can only have one value
474
# Params that can only have one value
474
my $scan = $params->{'scan'};
475
my $scan = $params->{'scan'};
475
my $count = C4::Context->preference('numSearchResults') || 20;
476
my $count = C4::Context->preference('numSearchResults') || 20;
477
my @results_per_page_options = grep /^\d+$/,
478
                                map {s/\s+//g;$_;}
479
                                split /,/, C4::Context->preference('numSearchResultsPerPage');
480
push(@results_per_page_options, $count);
481
482
@results_per_page_options = do { my %seen; grep { !$seen{$_}++ } @results_per_page_options };
483
@results_per_page_options = sort {$a <=> $b} @results_per_page_options;
484
476
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
485
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
477
my $page = $cgi->param('page') || 1;
486
my $page = $cgi->param('page') || 1;
478
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0;
487
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0;
Lines 616-621 for (my $i=0;$i<@servers;$i++) { Link Here
616
            }
625
            }
617
            $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed;
626
            $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed;
618
            $template->param(results_per_page =>  $results_per_page == $hits ? 'all' : $results_per_page);
627
            $template->param(results_per_page =>  $results_per_page == $hits ? 'all' : $results_per_page);
628
            $template->param(results_per_page_options =>  \@results_per_page_options);
619
            # must define a value for size if not present in DB
629
            # must define a value for size if not present in DB
620
            # in order to avoid problems generated by the default size value in TT
630
            # in order to avoid problems generated by the default size value in TT
621
            foreach my $line (@newresults) {
631
            foreach my $line (@newresults) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref (+10 lines)
Lines 148-153 Searching: Link Here
148
            - pref: numSearchResults
148
            - pref: numSearchResults
149
              class: integer
149
              class: integer
150
            - results per page in the staff client.
150
            - results per page in the staff client.
151
            - 'Include options for showing'
152
            - pref: numSearchResultsPerPage
153
              class: text
154
              default: "10,20,40,60,80,100"
155
            - results per page.
151
        -
156
        -
152
            - By default, sort search results in the OPAC by
157
            - By default, sort search results in the OPAC by
153
            - pref: OPACdefaultSortField
158
            - pref: OPACdefaultSortField
Lines 190-195 Searching: Link Here
190
            - pref: OPACnumSearchResults
195
            - pref: OPACnumSearchResults
191
              class: integer
196
              class: integer
192
            - results per page in the OPAC.
197
            - results per page in the OPAC.
198
            - 'Include options for showing'
199
            - pref: numSearchResultsPerPage
200
              class: text
201
              default: "10,20,40,60,80,100"
202
            - results per page.
193
        -
203
        -
194
            - "Show facets for"
204
            - "Show facets for"
195
            - pref: DisplayLibraryFacets
205
            - pref: DisplayLibraryFacets
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-6 / +9 lines)
Lines 306-320 var holdForPatron = function () { Link Here
306
                    </select>
306
                    </select>
307
                <!-- RESORT END -->
307
                <!-- RESORT END -->
308
                <!-- RESULTS_PER_PAGE START -->
308
                <!-- RESULTS_PER_PAGE START -->
309
                    [% IF results_per_page_options %]
309
                    <label for="results_per_page">Results per page: </label>
310
                    <label for="results_per_page">Results per page: </label>
310
                    <select id="results_per_page" name="results_per_page">
311
                    <select id="results_per_page" name="results_per_page">
311
                        <option value="20" [% 'SELECTED' IF results_per_page == '20' %]>20</option>
312
                        [% FOREACH res_option IN results_per_page_options %]
312
                        <option value="40" [% 'SELECTED' IF results_per_page == '40' %]>40</option>
313
                            [% IF results_per_page == res_option %]
313
                        <option value="60" [% 'SELECTED' IF results_per_page == '60' %]>60</option>
314
                                <option value="[% res_option %]" SELECTED>[% res_option %]</option>
314
                        <option value="80" [% 'SELECTED' IF results_per_page == '80' %]>80</option>
315
                            [% ELSE %]
315
                        <option value="100" [% 'SELECTED' IF results_per_page == '100' %]>100</option>
316
                                <option value="[% res_option %]">[% res_option %]</option>
316
                        <option value="all" [% 'SELECTED' IF results_per_page == 'all' %]>all</option>
317
                            [% END %]
318
                        [% END %]
317
                    </select>
319
                    </select>
320
                    [% END %]
318
                <!-- RESULTS_PER_PAGE END -->
321
                <!-- RESULTS_PER_PAGE END -->
319
                    <input type="submit" value="Go" />
322
                    <input type="submit" value="Go" />
320
            </form>
323
            </form>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-8 / +9 lines)
Lines 145-161 Link Here
145
                                    [% UNLESS tag %]
145
                                    [% UNLESS tag %]
146
                                        <div class="sort_by pull-right">
146
                                        <div class="sort_by pull-right">
147
                                            <select id="sort_by" class="resort" name="sort_by"> [% INCLUDE 'resort_form.inc' %] </select>
147
                                            <select id="sort_by" class="resort" name="sort_by"> [% INCLUDE 'resort_form.inc' %] </select>
148
148
                                            [% IF results_per_page_options %]
149
                                            <label for="results_per_page">Results per page: </label>
149
                                            <label for="results_per_page">Results per page: </label>
150
                                            <select id="results_per_page" name="results_per_page">
150
                                            <select id="results_per_page" name="results_per_page">
151
                                                <option value="20" [% 'SELECTED' IF results_per_page == '20' %]>20</option>
151
                                                [% FOREACH res_option IN results_per_page_options %]
152
                                                <option value="40" [% 'SELECTED' IF results_per_page == '40' %]>40</option>
152
                                                    [% IF results_per_page == res_option %]
153
                                                <option value="60" [% 'SELECTED' IF results_per_page == '60' %]>60</option>
153
                                                        <option value="[% res_option %]" SELECTED>[% res_option %]</option>
154
                                                <option value="80" [% 'SELECTED' IF results_per_page == '80' %]>80</option>
154
                                                    [% ELSE %]
155
                                                <option value="100" [% 'SELECTED' IF results_per_page == '100' %]>100</option>
155
                                                        <option value="[% res_option %]">[% res_option %]</option>
156
                                                <option value="all" [% 'SELECTED' IF results_per_page == 'all' %]>all</option>
156
                                                    [% END %]
157
                                                [% END %]
157
                                            </select>
158
                                            </select>
158
159
                                            [% END %]
159
                                            <input type="submit" class="btn btn-small clearfix" id="sortsubmit" value="Go" />
160
                                            <input type="submit" class="btn btn-small clearfix" id="sortsubmit" value="Go" />
160
                                        </div>
161
                                        </div>
161
                                    [% END %]
162
                                    [% END %]
(-)a/opac/opac-search.pl (-1 / +8 lines)
Lines 481-486 if ($params->{'limit-yr'}) { Link Here
481
my $scan = $params->{'scan'};
481
my $scan = $params->{'scan'};
482
my $count = C4::Context->preference('OPACnumSearchResults') || 20;
482
my $count = C4::Context->preference('OPACnumSearchResults') || 20;
483
my $countRSS         = C4::Context->preference('numSearchRSSResults') || 50;
483
my $countRSS         = C4::Context->preference('numSearchRSSResults') || 50;
484
my @results_per_page_options = grep /^\d+$/,
485
                                map {s/\s+//g;$_;}
486
                                split /,/, C4::Context->preference('OPACnumSearchResultsPerPage');
487
push(@results_per_page_options, $count);
488
489
@results_per_page_options = do { my %seen; grep { !$seen{$_}++ } @results_per_page_options };
490
@results_per_page_options = sort {$a <=> $b} @results_per_page_options;
484
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
491
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
485
my $page = $cgi->param('page') || 1;
492
my $page = $cgi->param('page') || 1;
486
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0;
493
my $offset = $results_per_page != 'all' ? ($page-1)*$results_per_page : 0;
Lines 757-762 for (my $i=0;$i<@servers;$i++) { Link Here
757
            }
764
            }
758
            $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed;
765
            $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed;
759
            $template->param(results_per_page =>  $results_per_page == $hits ? 'all' : $results_per_page);
766
            $template->param(results_per_page =>  $results_per_page == $hits ? 'all' : $results_per_page);
767
            $template->param(results_per_page_options =>  \@results_per_page_options);
760
            my $hide = C4::Context->preference('OpacHiddenItems');
768
            my $hide = C4::Context->preference('OpacHiddenItems');
761
            $hide = ($hide =~ m/\S/) if $hide; # Just in case it has some spaces/new lines
769
            $hide = ($hide =~ m/\S/) if $hide; # Just in case it has some spaces/new lines
762
            my $branch = '';
770
            my $branch = '';
763
- 

Return to bug 14715