From e33742c676c4ac8c9540a0d1f8391eecba92372b Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 18 Apr 2019 12:17:13 +0000
Subject: [PATCH] Bug 20689: (follow-up) Correct scope of template variables

The removal of the <select>s should have been accompanied by a
correction to the scope of tagfield and tagsubfield. It is also
unnecessary to conditionally include the "value" attribute.

To test, apply the patch and test the process for editing an item search
field. All the correct values should appear in form fields during edit,
and all values should save correctly.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../includes/admin-items-search-field-form.inc | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc
index 302a9b6e56..e7286bf62a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc
@@ -13,29 +13,17 @@
   </li>
   <li>
     <label class="required" for="label">Label: </label>
-    [% IF field %]
         <input type="text" name="label" id="label" value="[% field.label | html %]" class="required" required="required" />
-    [% ELSE %]
-        <input type="text" name="label" id="label" class="required" required="required" />
-    [% END %]
           <span class="required">Required</span>
   </li>
   <li>
     <label class="required" for="tagfield">MARC field: </label>
-    [% IF field && field.tagfield == tagfield %]
-        <input type="text" id="tagfield" name="tagfield" maxlength="3" size="3" class="required" pattern="[a-zA-Z0-9]+" required="required" value="[% tagfield | html %]" />
-    [% ELSE %]
-        <input type="text" id="tagfield" name="tagfield" maxlength="3" size="3" class="required" pattern="[a-zA-Z0-9]+" required="required" />
-    [% END %]
-    <span class="required">Required</span>
+        <input type="text" id="tagfield" name="tagfield" maxlength="3" size="3" class="required" pattern="[a-zA-Z0-9]+" required="required" value="[% field.tagfield | html %]" />
+        <span class="required">Required</span>
   </li>
   <li>
     <label for="tagsubfield">MARC subfield: </label>
-    [% IF field && field.tagsubfield == tagsubfield %]
-        <input type="text" id="tagsubfield" name="tagsubfield" pattern="[a-zA-Z0-9]+" maxlength="1" size="1" value="[% tagsubfield | html %]" />
-    [% ELSE %]
-        <input type="text" id="tagsubfield" name="tagsubfield" pattern="[a-zA-Z0-9]+" maxlength="1" size="1" />
-    [% END %]
+        <input type="text" id="tagsubfield" name="tagsubfield" pattern="[a-zA-Z0-9]+" maxlength="1" size="1" value="[% field.tagsubfield | html %]" />
   </li>
   <li>
     <label for="authorised_values_category">Authorised values category: </label>
-- 
2.39.5