Bugzilla – Attachment 101778 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: (QA follow-up) Remove limit on Zebra
Bug-14715-QA-follow-up-Remove-limit-on-Zebra.patch (text/plain), 3.74 KB, created by
Katrin Fischer
on 2020-03-25 21:41:08 UTC
(
hide
)
Description:
Bug 14715: (QA follow-up) Remove limit on Zebra
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2020-03-25 21:41:08 UTC
Size:
3.74 KB
patch
obsolete
>From 7cc8ae720cb742f53c95b603b491e8ee8552e325 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Wed, 25 Mar 2020 20:47:40 +0000 >Subject: [PATCH] Bug 14715: (QA follow-up) Remove limit on Zebra > >Found in testing that this appears to work well for Elasticsearch - >so removing everything that made this Zebra only. > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../intranet-tmpl/prog/en/modules/admin/preferences/searching.pref | 2 -- > koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 +- > 3 files changed, 2 insertions(+), 4 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref >index adcb142a1e..f6b69814cf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref >@@ -140,7 +140,6 @@ Searching: > yes: Show > no: "Don't show" > - results per page dropdown on staff client search results. >- - "Note: This does not work if ElasticSearch is activated." > - > - pref: OPACnumSearchResultsDropdown > type: boolean >@@ -149,7 +148,6 @@ Searching: > yes: Show > no: "Don't show" > - results per page dropdown on OPAC search results. >- - "Note: This does not work if ElasticSearch is activated." > - > - By default, sort search results in the staff client by > - pref: defaultSortField >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index ce4692ecad..dfc3d6026b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -269,7 +269,7 @@ > </ul> > </div> <!-- /.btn-group --> > >- [% IF Koha.Preference('numSearchResultsDropdown') && Koha.Preference('SearchEngine') == "Zebra" %] >+ [% IF Koha.Preference('numSearchResultsDropdown') %] > <div class="btn-group"> > <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> > Results per page: [% results_per_page | html %] <span class="caret"></span> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >index 7ff96820a2..66912e6a44 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -164,7 +164,7 @@ > <div class="sort_by pull-right"> > <select id="sort_by" class="resort" name="sort_by"> [% INCLUDE 'resort_form.inc' %] </select> > >- [% IF Koha.Preference('OPACnumSearchResultsDropdown') && Koha.Preference('SearchEngine') == "Zebra" %] >+ [% IF Koha.Preference('OPACnumSearchResultsDropdown') %] > <label for="results_per_page">Results per page: </label> > <select id="results_per_page" name="count"> > [% IF Koha.Preference('OPACnumSearchResults') %] >-- >2.11.0
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