From 04e83721111ffde8969ac91f895fd20c1cce5f7b Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 21 Mar 2024 14:16:23 +0100
Subject: [PATCH] Bug 36394: Fix footers behaviour on the ES mapping page

In the footers of the tables of the search fields and mappings,
the options selected are not consistent.
Additionally they are not reset correctly when a new line is added.

Test plan:
0. Do not apply to recreate the problem
1. Go to the ES mapping page
2. Click tab "Bibliographic records"
3. At the bottom, notice the Yes/No dropdown lists
=> They are inconsistent, sometimes 'Yes', sometimes 'No'
4. Click Add
=> Values are kept

5. Apply this patch
6. Repeat 1, 2, 3
=> No (first option) is always selected
7. Click Add after you modified some values
=> "No" is selected

Sponsored-by: The Research University in the Helmholtz Association (KIT)
Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit d12ae6b9e26be680be8789f7f2e10aab92680697)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../searchengine/elasticsearch/mappings.tt    | 36 +++++--------------
 .../prog/js/elasticsearch-mappings.js         |  2 +-
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
index a6922365aa..462ff7acad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
@@ -403,46 +403,26 @@ a.add, a.delete {
                                     </td>
                                     <td>
                                         <select data-id="mapping_facet">
-                                            [% IF mapping.facet %]
-                                                <option value="0">No</option>
-                                                <option value="1" selected="selected">Yes</option>
-                                            [% ELSE %]
-                                                <option value="0" selected="selected">No</option>
-                                                <option value="1">Yes</option>
-                                            [% END %]
+                                            <option value="0">No</option>
+                                            <option value="1">Yes</option>
                                         </select>
                                     </td>
                                     <td>
                                         <select data-id="mapping_suggestible">
-                                            [% IF mapping.suggestible %]
-                                                <option value="0">No</option>
-                                                <option value="1" selected="selected">Yes</option>
-                                            [% ELSE %]
-                                                <option value="0" selected="selected">No</option>
-                                                <option value="1">Yes</option>
-                                            [% END %]
+                                            <option value="0">No</option>
+                                            <option value="1">Yes</option>
                                         </select>
                                     </td>
                                     <td>
                                         <select data-id="mapping_search">
-                                            [% IF mapping.search %]
-                                                <option value="0">No</option>
-                                                <option value="1" selected="selected">Yes</option>
-                                            [% ELSE %]
-                                                <option value="0" selected="selected">No</option>
-                                                <option value="1">Yes</option>
-                                            [% END %]
+                                            <option value="0">No</option>
+                                            <option value="1">Yes</option>
                                         </select>
                                     </td>
                                     <td>
                                         <select name="mapping_filter">
-                                            [% IF mapping.filter == 'punctuation' %]
-                                                <option value="">None</option>
-                                                <option value="punctuation" selected="selected">Punctuation</option>
-                                            [% ELSE %]
-                                                <option value="" selected="selected">None</option>
-                                                <option value="punctuation">Punctuation</option>
-                                            [% END %]
+                                            <option value="">None</option>
+                                            <option value="punctuation">Punctuation</option>
                                         </select>
                                     </td>
                                     <td><input data-id="mapping_marc_field" type="text" /></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/elasticsearch-mappings.js b/koha-tmpl/intranet-tmpl/prog/js/elasticsearch-mappings.js
index 696d8d5cf7..b40fec0f45 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/elasticsearch-mappings.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/elasticsearch-mappings.js
@@ -2,7 +2,7 @@
 
 function clean_line(line) {
     $(line).find('input[type="text"]').val("");
-    $(line).find('select').find('option:first').attr("selected", "selected");
+    $(line).find('select').find('option:first').prop("selected", true);
 }
 
 function clone_line(line) {
-- 
2.39.5