From 575ed7df403cc201bed2439ab5295fbad9fc1114 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Mon, 16 Jul 2018 15:50:42 +0000 Subject: [PATCH] Bug 19482: (follow-up) QA fixes Remove debug statement Use disaled select to match other fields --- Koha/SearchEngine/Elasticsearch.pm | 1 - .../admin/searchengine/elasticsearch/mappings.tt | 81 +++++++++++----------- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/Koha/SearchEngine/Elasticsearch.pm b/Koha/SearchEngine/Elasticsearch.pm index bc129f6..4e90c86 100644 --- a/Koha/SearchEngine/Elasticsearch.pm +++ b/Koha/SearchEngine/Elasticsearch.pm @@ -256,7 +256,6 @@ sub reset_elasticsearch_mappings { my $field_type = $data->{type}; my $field_label = $data->{label}; my $field_mandatory = $data->{mandatory}; - warn $field_mandatory; my $mappings = $data->{mappings}; my $search_field = Koha::SearchFields->find_or_create({ name => $field_name, label => $field_label, type => $field_type, mandatory => $field_mandatory }, { key => 'name' }); for my $mapping ( @$mappings ) { 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 40ec383..616d35c 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 @@ -157,46 +157,48 @@ a.add, a.delete { [% IF is_readonly %] - + + - - [% IF search_field.type == "string" %] - - [% ELSE %] - - [% END %] - [% IF search_field.type == "date" %] - - [% ELSE %] - - [% END %] - [% IF search_field.type == "number" %] - - [% ELSE %] - - [% END %] - [% IF search_field.type == "boolean" %] - - [% ELSE %] - - [% END %] - [% IF search_field.type == "sum" %] - - [% ELSE %] - - [% END %] - [% IF search_field.type == "isbn" %] - - [% ELSE %] - - [% END %] - [% IF search_field.type == "stdno" %] - - [% ELSE %] - - [% END %] - + + [% END %] [% END %] @@ -292,6 +294,7 @@ a.add, a.delete { Delete [% END %] + [% END %] -- 2.1.4