Attachment 112462 Details for Bug 19482 – Bug 19482: (follow-up) Add missing filters and boolean switch to schema

[patch] Bug 19482: (follow-up) Add missing filters and boolean switch to schema

Bug-19482-follow-up-Add-missing-filters-and-boolea.patch (text/plain), 3.34 KB, created by Katrin Fischer on 2020-10-25 02:29:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-10-25 02:29:02 UTC

Size: 3.34 KB

patch

obsolete

>From 7eb437881f9889e6bc7fecf050371554d3c2a0f4 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>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 <katrin.fischer.83@web.de>
>---
> 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 %]
>                     <tr>
>                       <td>
>-                        <input type="text" name="search_field_name" value="[% search_field.name | html %]" [% is_readonly %]/>
>+                        <input type="text" name="search_field_name" value="[% search_field.name | html %]" [% is_readonly | html %]/>
>                       </td>
>                       <td>
>-                        <input type="text" name="search_field_label" value="[% search_field.label | html %]" [% is_readonly %]/>
>+                        <input type="text" name="search_field_label" value="[% search_field.label | html %]" [% is_readonly | html %]/>
>                       <td>
>-<<<<<<< HEAD
>                         [% IF is_readonly %]
>                             <input type="hidden" name="search_field_type" value="[% search_field.type | html %]" />
>                             <select name="search_field_type" disabled>
>@@ -386,7 +385,7 @@ a.add, a.delete {
>                                     <input name="mapping_marc_field" type="text" value="[% mapping.marc_field | html %]" />
>                                 </td>
>                                 [% IF mapping.search_field_mandatory %]
>-                                    <td><a class="btn btn-default btn-xs delete mandatory" data-field_name="[% mapping.search_field_name %]" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td>
>+                                    <td><a class="btn btn-default btn-xs delete mandatory" data-field_name="[% mapping.search_field_name | html %]" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td>
>                                 [% ELSE %]
>                                     <td><a class="btn btn-default btn-xs delete" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td>
>                                 [% END %]
>-- 
>2.11.0

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