some code improvements

diff --git a/CRM/Event/Form/ManageEvent/Repeat.php b/CRM/Event/Form/ManageEvent/Repeat.php
index 8f85e84a989030977682c119713ee3f30ef7e723..267a96b1cabf1f357c651667db21505b0a94c15b 100644 (file)
--- a/CRM/Event/Form/ManageEvent/Repeat.php
+++ b/CRM/Event/Form/ManageEvent/Repeat.php
@@ -157,6 +157,7 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
     else {
         CRM_Core_Error::fatal("Could not find Event ID");
     }
+    parent::endPostProcess();
   }
 
    /**

diff --git a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
index 9485469c001e752c39e9d1612451e8d59f9f6ded..ba2be71f047331785bc0b686e26ea690008b5b91 100644 (file)
--- a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
@@ -51,6 +51,7 @@
 {literal}
   <script type="text/javascript">
     CRM.$(function($) {
+      var $dialog;
       /** Add your linked entity mapper here **/
       var mapper = {'CRM_Event_Form_ManageEvent_EventInfo': '',
                 'CRM_Event_Form_ManageEvent_Location': '',
@@ -61,7 +62,7 @@
                 'CRM_Activity_Form_Activity': ''
                 };
       function cascadeChangesDialog() {
-        $("#recurring-dialog").dialog({
+        $dialog =  $("#recurring-dialog").dialog({
           title: 'How does this change affect other repeating entities in the set?',
           modal: true,
           width: '650',
@@ -117,14 +118,14 @@
             success: function (result) {
               if (result.status != "" && result.status == 'Done') {
                 $('#mainTabContainer div:visible Form, form.'+form).submit();
-                $("#recurring-dialog").dialog('close');
+                $dialog.dialog('close');
               } else if (result.status != "" && result.status == 'Error') {
                 var errorBox = confirm(ts("Mode could not be updated, save only this event?"));
                 if (errorBox == true) {
                   $('#mainTabContainer div:visible Form, form.'+form).submit();
-                  $("#recurring-dialog").dialog('close');
+                  $dialog.dialog('close');
                 } else {
-                  $("#recurring-dialog").dialog('close');
+                  $dialog.dialog('close');
                   return false;
                 }
               }