From 917ebce871faa4a69e3357328d26cc02967fed91 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Tue, 18 Aug 2020 11:32:51 +0000
Subject: [PATCH] Bug 19482: (follow-up) Fix select and adjust export of new
 field

---
 Koha/SearchEngine/Elasticsearch.pm                                      | 1 +
 .../prog/en/modules/admin/searchengine/elasticsearch/mappings.tt        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Koha/SearchEngine/Elasticsearch.pm b/Koha/SearchEngine/Elasticsearch.pm
index 43654bef15..daa98925fe 100644
--- a/Koha/SearchEngine/Elasticsearch.pm
+++ b/Koha/SearchEngine/Elasticsearch.pm
@@ -274,6 +274,7 @@ sub raw_elasticsearch_mappings {
 
             $mappings->{ $marc_map->index_name }{ $search_field->name }{label} = $search_field->label;
             $mappings->{ $marc_map->index_name }{ $search_field->name }{type} = $search_field->type;
+            $mappings->{ $marc_map->index_name }{ $search_field->name }{mandatory} = $search_field->mandatory;
             $mappings->{ $marc_map->index_name }{ $search_field->name }{facet_order} = $search_field->facet_order if defined $search_field->facet_order;
             $mappings->{ $marc_map->index_name }{ $search_field->name }{weight} = $search_field->weight if defined $search_field->weight;
             $mappings->{ $marc_map->index_name }{ $search_field->name }{opac} = $search_field->opac if defined $search_field->opac;
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 18416b0753..2fb39d8231 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
@@ -201,6 +201,7 @@ a.add, a.delete {
                             <select name="search_field_type" disabled>
                         [% ELSE %]
                             <select name="search_field_type">
+                        [% END %]
                               <option value=""></option>
                               [% IF search_field.type == "string" %]
                                 <option value="string" selected="selected">String</option>
@@ -243,7 +244,6 @@ a.add, a.delete {
                                 <option value="stdno">Std. Number</option>
                               [% END %]
                             </select>
-                        [% END %]
                       </td>
                       <td>
                         <select name="search_field_staff_client">
-- 
2.11.0