From f3642e0b531a275c39ef3a1257ecd77562f181f4 Mon Sep 17 00:00:00 2001 From: mzd Date: Mon, 28 Apr 2014 21:09:36 -0400 Subject: [PATCH] fix regression bug in js scoping remove now unused code in php ensure additional-profiles are hidden on load when appropriate --- CRM/Event/Form/ManageEvent/Registration.php | 6 ------ .../CRM/Event/Form/ManageEvent/Registration.tpl | 17 ++++++++++------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/CRM/Event/Form/ManageEvent/Registration.php b/CRM/Event/Form/ManageEvent/Registration.php index 2b23e76508..041d4f1938 100644 --- a/CRM/Event/Form/ManageEvent/Registration.php +++ b/CRM/Event/Form/ManageEvent/Registration.php @@ -217,15 +217,9 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent ); if (empty($defaults)) { $this->_showHide->addHide('registration'); - $this->_showHide->addHide('additional_profile_pre'); - $this->_showHide->addHide('additional_profile_post'); $this->_showHide->addHide('id-approval-text'); } else { - if (empty($defaults['is_multiple_registrations'])) { - $this->_showHide->addHide('additional_profile_pre'); - $this->_showHide->addHide('additional_profile_post'); - } if (empty($defaults['requires_approval'])) { $this->_showHide->addHide('id-approval-text'); } diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.tpl b/templates/CRM/Event/Form/ManageEvent/Registration.tpl index cebafa068f..5208c3e783 100644 --- a/templates/CRM/Event/Form/ManageEvent/Registration.tpl +++ b/templates/CRM/Event/Form/ManageEvent/Registration.tpl @@ -347,6 +347,10 @@ invert = 0 CRM.alert( msg3, '', 'info', {expires:0} ); } } + + var profileBottomCount = Number({/literal}{$profilePostMultiple|@count}{literal}); + var profileBottomCountAdd = Number({/literal}{$profilePostMultipleAdd|@count}{literal}); + function addBottomProfile( e ) { e.preventDefault(); @@ -376,10 +380,13 @@ $(function($) { showRuleFields( {/literal}{$ruleFields}{literal} ); - $("#is_multiple_registrations").change( function( ) { + var allow_multiple = $("#is_multiple_registrations"); + if ( !allow_multiple.prop('checked') ) { + $('#additional_profile_pre,#additional_profile_post').hide(); + } + allow_multiple.change( function( ) { if ( !$(this).prop('checked') ) { - $("#additional_custom_pre_id").val(''); - $("#additional_custom_post_id").val(''); + $("#additional_custom_pre_id,#additional_custom_post_id").val(''); $(".crm-event-manage-registration-form-block-additional_custom_post_multiple").hide(); $('#additional_profile_pre,#additional_profile_post').hide(); } else { @@ -392,14 +399,10 @@ $(function($) { $('#allow_same_participant_emails').change( function() { showRuleFields({/literal}{$ruleFields}{literal}) }); - var profileBottomCount = Number({/literal}{$profilePostMultiple|@count}{literal}); - var profileBottomCountAdd = Number({/literal}{$profilePostMultipleAdd|@count}{literal}); - $('#registration_blocks').on('click', '.crm-button-add-profile', addBottomProfile); $('#registration_blocks').on('click', '.crm-button-rem-profile', removeBottomProfile); }); // END onReady - }(CRM.$, CRM._)); //Generic Closure {/literal} -- 2.25.1