From 7eb437881f9889e6bc7fecf050371554d3c2a0f4 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 16 Oct 2020 14:30:00 +0000 Subject: [PATCH] Bug 19482: (follow-up) Add missing filters and boolean switch to schema Signed-off-by: Katrin Fischer --- Koha/Schema/Result/SearchField.pm | 4 ++++ .../prog/en/modules/admin/searchengine/elasticsearch/mappings.tt | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Koha/Schema/Result/SearchField.pm b/Koha/Schema/Result/SearchField.pm index 540d984274..81fc076287 100644 --- a/Koha/Schema/Result/SearchField.pm +++ b/Koha/Schema/Result/SearchField.pm @@ -152,6 +152,10 @@ __PACKAGE__->has_many( # Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-10-02 12:47:22 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EbUa4eprgxeUkoOUiXO/Cg +__PACKAGE__->add_columns( + '+mandatory' => { is_boolean => 1 }, +); + __PACKAGE__->many_to_many("search_marc_maps", "search_marc_to_fields", "search_marc_map"); 1; 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 2fb39d8231..ed2e5229a1 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 @@ -190,12 +190,11 @@ a.add, a.delete { [% END %] - + - + -<<<<<<< HEAD [% IF is_readonly %] [% IF mapping.search_field_mandatory %] - Delete + Delete [% ELSE %] Delete [% END %] -- 2.11.0