From e1bbff6b7f9db37714fcdb69b03598600e222237 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 26 Aug 2011 10:54:07 -0400
Subject: [PATCH] Fix for Bug 6458 - incorrect parsing result in translation
 processing / patron-attr-types

Correction for patron-attr-types.tt stops tag attribute markup from
being passed to the template directly in favor of using template
logic.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Read the patch and tested the page, didn't find any problems.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 admin/patron-attr-types.pl                    | 24 +++++-----
 .../en/modules/admin/patron-attr-types.tt     | 46 +++++++++++++++++--
 2 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/admin/patron-attr-types.pl b/admin/patron-attr-types.pl
index 1dfe442a60..227213cda8 100755
--- a/admin/patron-attr-types.pl
+++ b/admin/patron-attr-types.pl
@@ -92,19 +92,19 @@ sub error_add_attribute_type_form {
     $template->param(description => $input->param('description'));
 
     if ($input->param('repeatable')) {
-        $template->param(repeatable_checked => 'checked="checked"');
+        $template->param(repeatable_checked => 1);
     }
     if ($input->param('unique_id')) {
-        $template->param(unique_id_checked => 'checked="checked"');
+        $template->param(unique_id_checked => 1);
     }
     if ($input->param('password_allowed')) {
-        $template->param(password_allowed_checked => 'checked="checked"');
+        $template->param(password_allowed_checked => 1);
     }
     if ($input->param('opac_display')) {
-        $template->param(opac_display_checked => 'checked="checked"');
+        $template->param(opac_display_checked => 1);
     }
     if ($input->param('staff_searchable')) {
-        $template->param(staff_searchable_checked => 'checked="checked"');
+        $template->param(staff_searchable_checked => 1);
     }
 
     $template->param(
@@ -206,21 +206,21 @@ sub edit_attribute_type_form {
     $template->param(description => $attr_type->description());
 
     if ($attr_type->repeatable()) {
-        $template->param(repeatable_checked => 'checked="checked"');
+        $template->param(repeatable_checked => 1);
     }
-    $template->param(repeatable_disabled => 'disabled="disabled"');
+    $template->param(repeatable_disabled => 1);
     if ($attr_type->unique_id()) {
-        $template->param(unique_id_checked => 'checked="checked"');
+        $template->param(unique_id_checked => 1);
     }
-    $template->param(unique_id_disabled => 'disabled="disabled"');
+    $template->param(unique_id_disabled => 1);
     if ($attr_type->password_allowed()) {
-        $template->param(password_allowed_checked => 'checked="checked"');
+        $template->param(password_allowed_checked => 1);
     }
     if ($attr_type->opac_display()) {
-        $template->param(opac_display_checked => 'checked="checked"');
+        $template->param(opac_display_checked => 1);
     }
     if ($attr_type->staff_searchable()) {
-        $template->param(staff_searchable_checked => 'checked="checked"');
+        $template->param(staff_searchable_checked => 1);
     }
 
     authorised_value_category_list($template, $attr_type->authorised_value_category());
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
index 105d268826..c42d7b3ec6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
@@ -101,25 +101,61 @@ function CheckAttributeTypeForm(f) {
                   value="[% description |html %]" />
        </li>
        <li><label for="repeatable">Repeatable: </label>
-            <input type="checkbox" id="repeatable" name="repeatable" [% repeatable_checked %] [% repeatable_disabled %] />
+            [% IF ( repeatable_checked ) %]
+              [% IF ( repeatable_disabled ) %]
+                <input type="checkbox" id="repeatable" name="repeatable" checked="checked" disabled="disabled" />
+              [% ELSE %]
+                <input type="checkbox" id="repeatable" name="repeatable" checked="checked" />
+              [% END %]
+            [% ELSE %]
+              [% IF ( repeatable_disabled ) %]
+                <input type="checkbox" id="repeatable" name="repeatable" disabled="disabled" />
+              [% ELSE %]
+                <input type="checkbox" id="repeatable" name="repeatable" />
+              [% END %]
+            [% END %]
             <span>Check to let a patron record have multiple values of this attribute.  
                   This setting cannot be changed after an attribute is defined.</span>
        </li>
        <li><label for="unique_id">Unique identifier: </label>
-            <input type="checkbox" id="unique_id" name="unique_id" [% unique_id_checked %] [% unique_id_disabled %] />
+            [% IF ( unique_id_checked ) %]
+              [% IF ( unique_id_disabled ) %]
+                <input type="checkbox" id="unique_id" name="unique_id" checked="checked" disabled="disabled" />
+              [% ELSE %]
+                <input type="checkbox" id="unique_id" name="unique_id" checked="checked" />
+              [% END %]
+            [% ELSE %]
+              [% IF ( unique_id_disabled ) %]
+                <input type="checkbox" id="unique_id" name="unique_id" disabled="disabled" />
+              [% ELSE %]
+                <input type="checkbox" id="unique_id" name="unique_id" />
+              [% END %]
+            [% END %]
             <span>If checked, attribute will be a unique identifier &mdash; if a value is given to a patron record, the same value
                   cannot be given to a different record.  This setting cannot be changed after an attribute is defined.</span>
        </li>
        <li><label for="password_allowed">Allow password: </label>
-            <input type="checkbox" id="password_allowed" name="password_allowed" [% password_allowed_checked %] />
+          [% IF ( password_allowed_checked ) %]
+            <input type="checkbox" id="password_allowed" name="password_allowed" checked="checked" />
+          [% ELSE %]
+            <input type="checkbox" id="password_allowed" name="password_allowed" />
+          [% END %]
             <span>Check to make it possible to associate a password with this attribute.</span>
        </li>
        <li><label for="opac_display">Display in OPAC: </label>
-            <input type="checkbox" id="opac_display" name="opac_display" [% opac_display_checked %] />
+          [% IF ( opac_display_checked ) %]
+            <input type="checkbox" id="opac_display" name="opac_display" checked="checked" />
+          [% ELSE %]
+            <input type="checkbox" id="opac_display" name="opac_display" />
+          [% END %]
             <span>Check to display this attribute on a patron's details page in the OPAC.</span>
        </li>
        <li><label for="staff_searchable">Searchable: </label>
-            <input type="checkbox" id="staff_searchable" name="staff_searchable" [% staff_searchable_checked %] />
+          [% IF ( staff_searchable_checked ) %]
+            <input type="checkbox" id="staff_searchable" name="staff_searchable" checked="checked" />
+          [% ELSE %]
+            <input type="checkbox" id="staff_searchable" name="staff_searchable" />
+          [% END %]
             <span>Check to make this attribute staff_searchable in the staff patron search.</span>
        </li>
         <li><label for="authorised_value_category">Authorized value category: </label>
-- 
2.39.5