From 517a54ca8d75e4946e0f5fa0a69472a6385a5b8c Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 12 May 2017 09:18:45 -0400 Subject: [PATCH] [SIGNED-OFF] Bug 18596 - Quick add form duplicating password confirm To test: 1 - Add password to BorrowerMandatoryField 2 - View quick add form 3 - See confirm password twice 4 - Apply patch 5 - See confirm password once 6 - Add password to QuickAddFields 7 - Confirm one confirm field 8 - Remove password form BorrowerMandatory field 9 - Confirm there is one confirm field and password fields are not required Signed-off-by: Owen Leonard --- koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 3221b4a..d4c7cec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -1226,6 +1226,7 @@ $(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' ) { @@ -1237,7 +1238,7 @@ $(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') $("#entryform label[for='password2']").parent().clone().appendTo("#quick_add_list"); + if( input_label == 'password' && passwd_mandatory ) $("#entryform label[for='password2']").parent().clone().appendTo("#quick_add_list"); } }); if( $("#memberentry_guarantor").length ) { -- 2.1.4