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>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

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 adcb142..f6b6981 100644 (file)
--- 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 ce4692e..dfc3d60 100644 (file)
--- 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 7ff9682..66912e6 100644 (file)
--- 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') %]