Attachment 112464 Details for Bug 19482 – Bug 19482: (follow-up) Don't set readonly as a variable, use conditionals

[patch] Bug 19482: (follow-up) Don't set readonly as a variable, use conditionals

Bug-19482-follow-up-Dont-set-readonly-as-a-variabl.patch (text/plain), 2.67 KB, created by Katrin Fischer on 2020-10-25 02:29:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

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

Size: 2.67 KB

patch

obsolete

>From 05397ef7f211398b39b065a189ef399f651d309b Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Fri, 16 Oct 2020 16:13:32 +0000
>Subject: [PATCH] Bug 19482: (follow-up) Don't set readonly as a variable, use
> conditionals
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../admin/searchengine/elasticsearch/mappings.tt     | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
>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 ed2e5229a1..8eb5b9675b 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
>@@ -183,19 +183,23 @@ a.add, a.delete {
>                 </thead>
>                 <tbody>
>                   [% FOREACH search_field IN all_search_fields %]
>-                      [% IF search_field.mandatory %]
>-                          [% SET is_readonly = "readonly" %]
>-                      [% ELSE %]
>-                          [% SET is_readonly = "" %]
>-                      [% END %]
>                     <tr>
>                       <td>
>-                        <input type="text" name="search_field_name" value="[% search_field.name | html %]" [% is_readonly | html %]/>
>+                        [% IF search_field.mandatory %]
>+                            <input type="text" name="search_field_name" value="[% search_field.name | html %]" readonly />
>+                        [% ELSE %]
>+                            <input type="text" name="search_field_name" value="[% search_field.name | html %]" />
>+                        [% END %]
>                       </td>
>                       <td>
>-                        <input type="text" name="search_field_label" value="[% search_field.label | html %]" [% is_readonly | html %]/>
>+                        [% IF search_field.mandatory %]
>+                            <input type="text" name="search_field_label" value="[% search_field.label | html %]" readonly />
>+                        [% ELSE %]
>+                            <input type="text" name="search_field_label" value="[% search_field.label | html %]" />
>+                        [% END %]
>+
>                       <td>
>-                        [% IF is_readonly %]
>+                        [% IF search_field.mandatory %]
>                             <input type="hidden" name="search_field_type" value="[% search_field.type | html %]" />
>                             <select name="search_field_type" disabled>
>                         [% ELSE %]
>-- 
>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