From 927b488ead0a0f880fa7fa677aa3861010320cf2 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 6 May 2022 12:40:00 +0000
Subject: [PATCH] Bug 27546: (follow-up) Avoid index clash

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc | 6 +++++-
 .../intranet-tmpl/prog/en/modules/catalogue/results.tt      | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
index d4ee49148b..4fab8b5caa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
@@ -1,5 +1,9 @@
 [% USE Koha %]
-<select class="advsearch" name="idx" id="idx">
+[% IF refiner %]
+    <select class="advsearch" name="idx" id="refiner_idx">
+[% ELSE %]
+    <select class="advsearch" name="idx" id="idx">
+[% END %]
     [% IF ms_kw %]
         <option selected="selected" value="kw">Keyword</option>
     [% ELSE %]
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 1740b823fb..9e90d7e4fb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -73,7 +73,7 @@
                         <form id="refine_search">
                             <label for="limit">Search within results</label>
                             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                                [% INCLUDE 'search_indexes.inc' ms_kw = 1 %]
+                                [% INCLUDE 'search_indexes.inc' ms_kw = 1 refiner = 1 %]
                             [% END %]
                             <input name="limit" id="refiner" type="text"  title="Search results">
                             <input type="submit" id="refine" value="Search">
@@ -774,7 +774,7 @@
 
         $("#refine_search").on('submit',function(e){
             e.preventDefault();
-            var index = $("#refine_search #idx").val() || "";
+            var index = $("#refine_search #refiner_idx").val() || "";
             if( index){index += ":";}
             window.location.href = "/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %]&[% limit_cgi | $raw %]&[% sort_cgi | $raw %]&limit="+index+escape_str( $("#refiner").val() );
         });
-- 
2.39.5