Bugzilla – Attachment 81203 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: (follow-up) Edits for ElasticSearch
Bug-14715-follow-up-Edits-for-ElasticSearch.patch (text/plain), 4.21 KB, created by
Aleisha Amohia
on 2018-10-25 22:05:04 UTC
(
hide
)
Description:
Bug 14715: (follow-up) Edits for ElasticSearch
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2018-10-25 22:05:04 UTC
Size:
4.21 KB
patch
obsolete
>From 526aa4eb58654c1cfecc16f143fb48cc4cb5932f Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Fri, 5 Oct 2018 02:03:18 +0000 >Subject: [PATCH] Bug 14715: (follow-up) Edits for ElasticSearch > >Note added to preferences that the dropdown should not be used with >ElasticSearch activated. >Dropdowns do not show on search results on staff side or OPAC side if >Elasticsearch enabled. > >Ready to test >--- > .../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, 4 insertions(+), 2 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 c1aa604..ce3d0be 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 >@@ -139,6 +139,7 @@ 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 >@@ -147,6 +148,7 @@ 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 64a7bd4..bbbec77 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -75,7 +75,7 @@ > </select> > <!-- RESORT END --> > <!-- RESULTS_PER_PAGE START --> >- [% IF Koha.Preference('numSearchResultsDropdown') %] >+ [% IF Koha.Preference('SearchEngine') eq "Zebra" && Koha.Preference('numSearchResultsDropdown') %] > <label for="results_per_page">Results per page: </label> > <select id="results_per_page" name="results_per_page"> > [% IF Koha.Preference('numSearchResults') %]<option value="[% Koha.Preference('numSearchResults') %]" selected="selected">Library default: [% Koha.Preference('numSearchResults') %]</option>[% ELSE %]<option value="[% Koha.Preference('numSearchResults') %]">Library default: [% Koha.Preference('numSearchResults') %]</option>[% END %] >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 0f93df8..2382685 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -147,7 +147,7 @@ > [% UNLESS tag %] > <div class="sort_by pull-right"> > <select id="sort_by" class="resort" name="sort_by"> [% INCLUDE 'resort_form.inc' %] </select> >- [% IF Koha.Preference('OPACnumSearchResultsDropdown') %] >+ [% IF Koha.Preference('SearchEngine') eq "Zebra" && Koha.Preference('OPACnumSearchResultsDropdown') %] > <label for="results_per_page">Results per page: </label> > <select id="results_per_page" name="results_per_page"> > [% IF Koha.Preference('OPACnumSearchResults') %]<option value="[% Koha.Preference('OPACnumSearchResults') %]" selected="selected">Library default: [% Koha.Preference('OPACnumSearchResults') %]</option>[% ELSE %]<option value="[% Koha.Preference('OPACnumSearchResults') %]">Library default: [% Koha.Preference('OPACnumSearchResults') %]</option>[% END %] >-- >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