Bugzilla – Attachment 56002 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: Fixing merge conflicts etc.
Bug-14715-Fixing-merge-conflicts-etc.patch (text/plain), 1.80 KB, created by
Aleisha Amohia
on 2016-10-04 03:08:01 UTC
(
hide
)
Description:
Bug 14715: Fixing merge conflicts etc.
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2016-10-04 03:08:01 UTC
Size:
1.80 KB
patch
obsolete
>From e6b94768d343e02885c59d00b74fadc927f88f8c Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Tue, 4 Oct 2016 03:02:01 +0000 >Subject: [PATCH] Bug 14715: Fixing merge conflicts etc. > >To test: >1) Do a catalog search in the intranet and OPAC >2) Confirm that results automatically update upon selection of results >per page to show >3) Test for all options (20, 40, 60, 80, 100, all) >--- > catalogue/search.pl | 1 - > opac/opac-search.pl | 1 - > 2 files changed, 2 deletions(-) > >diff --git a/catalogue/search.pl b/catalogue/search.pl >index 48f264f..336d868 100755 >--- a/catalogue/search.pl >+++ b/catalogue/search.pl >@@ -626,7 +626,6 @@ for (my $i=0;$i<@servers;$i++) { > if ($query_desc || $limit_desc) { > $template->param(searchdesc => 1); > } >- $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed; > $template->param(results_per_page => $results_per_page == $hits ? 'all' : $results_per_page); > $template->param(results_per_page_options => \@results_per_page_options); > # must define a value for size if not present in DB >diff --git a/opac/opac-search.pl b/opac/opac-search.pl >index fce9c68..358915b 100755 >--- a/opac/opac-search.pl >+++ b/opac/opac-search.pl >@@ -791,7 +791,6 @@ for (my $i=0;$i<@servers;$i++) { > if ($query_desc || $limit_desc) { > $template->param(searchdesc => 1); > } >- $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed; > $template->param(results_per_page => $results_per_page == $hits ? 'all' : $results_per_page); > my $hide = C4::Context->preference('OpacHiddenItems'); > $hide = ($hide =~ m/\S/) if $hide; # Just in case it has some spaces/new lines >-- >2.1.4
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