Attachment 80819 Details for Bug 19482 – Bug 19482: (follow-up) QA fixes

[patch] Bug 19482: (follow-up) QA fixes

Bug-19482-follow-up-QA-fixes.patch (text/plain), 7.13 KB, created by Nick Clemens (kidclamp) on 2018-10-18 12:25:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2018-10-18 12:25:42 UTC

Size: 7.13 KB

patch

obsolete

>From 575ed7df403cc201bed2439ab5295fbad9fc1114 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>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 {
>                       <td><input type="text" name="search_field_label" value="[% search_field.label | html %]" [% is_readonly %]/>
>                       <td>
>                         [% IF is_readonly %]
>-                            <input type="text" name="search_field_type" value="[% search_field.type FILTER ucfirst | html %]" [% is_readonly %] />
>+                            <input type="hidden" name="search_field_type" value="[% search_field.type | html %]" />
>+                            <select name="search_field_type" disabled>
>                         [% ELSE %]
>-                        <select name="search_field_type">
>-                          <option value=""></option>
>-                          [% IF search_field.type == "string" %]
>-                            <option value="string" selected="selected">String</option>
>-                          [% ELSE %]
>-                            <option value="string">String</option>
>-                          [% END %]
>-                          [% IF search_field.type == "date" %]
>-                            <option value="date" selected="selected">Date</option>
>-                          [% ELSE %]
>-                            <option value="date">Date</option>
>-                          [% END %]
>-                          [% IF search_field.type == "number" %]
>-                            <option value="number" selected="selected">Number</option>
>-                          [% ELSE %]
>-                            <option value="number">Number</option>
>-                          [% END %]
>-                          [% IF search_field.type == "boolean" %]
>-                            <option value="boolean" selected="selected">Boolean</option>
>-                          [% ELSE %]
>-                            <option value="boolean">Boolean</option>
>-                          [% END %]
>-                          [% IF search_field.type == "sum" %]
>-                            <option value="sum" selected="selected">Sum</option>
>-                          [% ELSE %]
>-                            <option value="sum">Sum</option>
>-                          [% END %]
>-                          [% IF search_field.type == "isbn" %]
>-                            <option value="isbn" selected="selected">ISBN</option>
>-                          [% ELSE %]
>-                            <option value="isbn">ISBN</option>
>-                          [% END %]
>-                          [% IF search_field.type == "stdno" %]
>-                            <option value="stdno" selected="selected">Std. Number</option>
>-                          [% ELSE %]
>-                            <option value="stdno">Std. Number</option>
>-                          [% END %]
>-                        </select>
>+                            <select name="search_field_type">
>+                              <option value=""></option>
>+                              [% IF search_field.type == "string" %]
>+                                <option value="string" selected="selected">String</option>
>+                              [% ELSE %]
>+                                <option value="string">String</option>
>+                              [% END %]
>+                              [% IF search_field.type == "date" %]
>+                                <option value="date" selected="selected">Date</option>
>+                              [% ELSE %]
>+                                <option value="date">Date</option>
>+                              [% END %]
>+                              [% IF search_field.type == "number" %]
>+                                <option value="number" selected="selected">Number</option>
>+                              [% ELSE %]
>+                                <option value="number">Number</option>
>+                              [% END %]
>+                              [% IF search_field.type == "boolean" %]
>+                                <option value="boolean" selected="selected">Boolean</option>
>+                              [% ELSE %]
>+                                <option value="boolean">Boolean</option>
>+                              [% END %]
>+                              [% IF search_field.type == "sum" %]
>+                                <option value="sum" selected="selected">Sum</option>
>+                              [% ELSE %]
>+                                <option value="sum">Sum</option>
>+                              [% END %]
>+                              [% IF search_field.type == "isbn" %]
>+                                <option value="isbn" selected="selected">ISBN</option>
>+                              [% ELSE %]
>+                                <option value="isbn">ISBN</option>
>+                              [% END %]
>+                              [% IF search_field.type == "stdno" %]
>+                                <option value="stdno" selected="selected">Std. Number</option>
>+                              [% ELSE %]
>+                                <option value="stdno">Std. Number</option>
>+                              [% END %]
>+                            </select>
>+                        [% END %]
>                       </td>
>                     </tr>
>                   [% END %]
>@@ -292,6 +294,7 @@ a.add, a.delete {
>                                   <td><a class="btn btn-default btn-xs delete" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td>
>                               </tr>
>                             [% END %]
>+                        [% END %]
>                       </tbody>
>                       <tfoot>
>                         <tr class="nodrag nodrop">
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 19482: 68246 | 68247 | 68248 | 69250 | 72846 | 72847 | 72848 | 72878 | 72879 | 72880 | 77007 | 77008 | 77009 | 77010 | 80817 | 80818 | 80819 | 80820 | 93366 | 93367 | 93368 | 93371 | 93372 | 93373 | 97226 | 97227 | 97228 | 101312 | 101313 | 101314 | 108467 | 108468 | 108469 | 108470 | 108471 | 111923 | 111924 | 111925 | 111926 | 111927 | 111929 | 112456 | 112459 | 112460 | 112461 | 112462 | 112463 | 112464 | 112465