From: Dave Greenberg <dave@civicrm.org>
Date: Tue, 2 Apr 2013 16:40:36 +0000 (-0700)
Subject: CRM-12248 fix status msg (should reference Supervised dedupe rule instead of Unsuperv... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a615afcc6f01f530c2987af9e315bd23b43759e9;p=civicrm-core.git

CRM-12248 fix status msg (should reference Supervised dedupe rule instead of Unsupervised) and fix alert display to be one-at-a-time.

----------------------------------------
* CRM-12248: Configure Event: Registration tab - ruleFields variable used to display alert for Allow multiple
  http://issues.civicrm.org/jira/browse/CRM-12248
---

diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.tpl b/templates/CRM/Event/Form/ManageEvent/Registration.tpl
index 85edf71f18..ac628658ee 100644
--- a/templates/CRM/Event/Form/ManageEvent/Registration.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Registration.tpl
@@ -359,18 +359,18 @@ invert              = 0
 
     function showRuleFields( ruleFields )
     {
-        var msg1 = '{/literal}{ts 1="' + ruleFields + '"}Primary participants will be able to register additional participants using the same e-email address.  The default "Unsupervised" Dedupe Rule will use the following fields to prevent duplicate registrations: %1.  First and Last Name will be used to check for matches among multiple participants.{/ts}{literal}';
+        var msg1 = '{/literal}{ts 1="' + ruleFields + '"}Primary participants will be able to register additional participants using the same e-email address.  The configured "Supervised" Dedupe Rule will use the following fields to prevent duplicate registrations: %1.  First and Last Name will be used to check for matches among multiple participants.{/ts}{literal}';
         var msg2 = '{/literal}{ts escape='js'}Primary participants will be allowed to register for this event multiple times.  No duplicate registration checking will be performed.{/ts}{literal}';
         var msg3 = '{/literal}{ts escape='js'}Primary participants will be able to register additional participants during registration.{/ts}{literal}';
 
         // Display info
-        cj('.ui-notify-message .icon.info').click();
+        cj('.ui-notify-message .ui-notify-close').click();
         if ( cj("#allow_same_participant_emails").attr( 'checked' ) && cj("#is_multiple_registrations").attr( 'checked' ) ) {
-            CRM.alert( msg1, '', 'info' );
+            CRM.alert( msg1, '', 'info', {expires:0} );
         } else if ( cj("#allow_same_participant_emails").attr( 'checked' ) && !cj("#is_multiple_registrations").attr( 'checked' ) ) {
-            CRM.alert( msg2, '', 'info' );
+            CRM.alert( msg2, '', 'info', {expires:0} );
         } else if ( !cj("#allow_same_participant_emails").attr( 'checked' ) && cj("#is_multiple_registrations").attr( 'checked' ) ) {
-            CRM.alert( msg3, '', 'info' );
+            CRM.alert( msg3, '', 'info', {expires:0} );
         }
     }