Attachment 97321 Details for Bug 21520 – Bug 21520: QA Follow-up: do not build html tags with TT conditions

[patch] Bug 21520: QA Follow-up: do not build html tags with TT conditions

Bug-21520-QA-Follow-up-do-not-build-html-tags-with.patch (text/plain), 2.76 KB, created by Jonathan Druart on 2020-01-13 15:46:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2020-01-13 15:46:13 UTC

Size: 2.76 KB

patch

obsolete

>From 1663f22708f5f0be856e957246b3b1db8654dba2 Mon Sep 17 00:00:00 2001
>From: Matthias Meusburger <matthias.meusburger@biblibre.com>
>Date: Fri, 3 Jan 2020 10:53:34 +0000
>Subject: [PATCH] Bug 21520: QA Follow-up: do not build html tags with TT
> conditions
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../prog/en/modules/admin/oai_set_mappings.tt      | 24 ++++++++++++++++++----
> 1 file changed, 20 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>index 6b9f995862..758d4dc940 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>@@ -46,8 +46,16 @@
>                 <tr>
>                   <td>
>                   <select name="rule_operator">
>-                    <option value="and" [% IF (mapping.rule_operator == 'and') %] selected="selected" [% END %]>and</option>
>-                    <option value="or" [% IF (mapping.rule_operator == 'or') %] selected="selected" [% END %]>or</option>
>+                    [% IF (mapping.rule_operator == 'and') %]
>+                    <option value="and" selected="selected">and</option>
>+                    [% ELSE %]
>+                    <option value="and">and</option>
>+                    [% END %]
>+                    [% IF (mapping.rule_operator == 'or') %]
>+                    <option value="or" selected="selected">or</option>
>+                    [% ELSE %]
>+                    <option value="or">or</option>
>+                    [% END %]
>                   </select>
>                   </td>
>                   <td><input type="text" name="marcfield" size="3" value="[% mapping.marcfield | html %]" /></td>
>@@ -74,8 +82,16 @@
>               <tr>
>                 <td>
>                   <select name="rule_operator">
>-                    <option value="and" [% IF (mapping.rule_operator == 'and') %] selected="selected" [% END %]>and</option>
>-                    <option value="or" [% IF (mapping.rule_operator == 'or') %] selected="selected" [% END %]>or</option>
>+                    [% IF (mapping.rule_operator == 'and') %]
>+                    <option value="and" selected="selected">and</option>
>+                    [% ELSE %]
>+                    <option value="and">and</option>
>+                    [% END %]
>+                    [% IF (mapping.rule_operator == 'or') %]
>+                    <option value="or" selected="selected">or</option>
>+                    [% ELSE %]
>+                    <option value="or">or</option>
>+                    [% END %]
>                   </select>
>                 </td>
>                 <td><input type="text" name="marcfield" size="3" /></td>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21520: 96041 | 96052 | 96790 | 97319 | 97320 | 97321 | 97322