From 7b110aee07b0bbdd14a5370dbc4c3e6a546f4571 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Thu, 18 May 2017 22:24:27 -0400
Subject: [PATCH] Bug 18596 (QA Followup)

    Use TT in a less awkward way
---
 koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index d4c7cec..de39ff7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1226,7 +1226,6 @@ $(document).ready(function() {
             [% q_add_f = Koha.Preference('PatronQuickAddFields').split('\|') %]
             var qaddfields = [[% FOREACH field IN q_add_f.unique %]"[% field %]",[% END %]];
             var skipped_fields = ["contactname","contactfirstname","relationship"]; //Guarantor form is pulled as a whole, ignore individual fields
-            var passwd_mandatory = [% IF mandatorypassword %]0[% ELSE %]1[% END %];
             $("#entryform label").each(function () {
                 var input_label = $(this).attr('for');
                 if ( input_label == 'sex-female' ) {
@@ -1238,7 +1237,9 @@ $(document).ready(function() {
                 if ( skipped_fields.indexOf( input_label ) != -1 ) { input_label=""; }
                 if( qaddfields.indexOf( input_label ) != -1 || $(this).attr('class') == 'required' ){
                    $(this).parent().clone().appendTo("#quick_add_list");
-                   if( input_label == 'password' && passwd_mandatory ) $("#entryform label[for='password2']").parent().clone().appendTo("#quick_add_list");
+                   [% UNLESS mandatorypassword %]
+                         if( input_label == 'password' ) $("#entryform label[for='password2']").parent().clone().appendTo("#quick_add_list");
+                   [% END %]
                 }
             });
                 if( $("#memberentry_guarantor").length ) {
-- 
2.1.4