Ajax return result correction and it's subsequent handling in js file

diff --git a/CRM/Core/Page/AJAX/RecurringEntity.php b/CRM/Core/Page/AJAX/RecurringEntity.php
index a5e78c91cb9296fa5b7616288517881d84a4848b..575b6d82fdae4f2282b1955ee27b90bea2248d11 100644 (file)
--- a/CRM/Core/Page/AJAX/RecurringEntity.php
+++ b/CRM/Core/Page/AJAX/RecurringEntity.php
@@ -35,10 +35,14 @@ class CRM_Core_Page_AJAX_RecurringEntity {
         $dao->entity_id = $entityId;
         $dao->entityTable = $entityTable;
       }
-      $dao->find(TRUE);
-      $dao->mode = $mode;
-      $dao->save();
-      $finalResult['status'] = 'Done';
+      
+      if($dao->find(TRUE)){
+        $dao->mode = $mode;
+        $dao->save();
+        $finalResult['status'] = 'Done';
+      }else{
+        $finalResult['status'] = 'Error';
+      }
     }
     echo json_encode($finalResult);
     CRM_Utils_System::civiExit();

diff --git a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
index 3149c13581a71243d056da7d256b12ebcfffdadc..daa6fac1d9c24fb6042fdec41fc55ab6197e9e90 100644 (file)
--- a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
@@ -117,9 +117,13 @@
           data: data,
           url:  ajaxurl,
           success: function (result) {
-            $("#repeat-mode-dailog").dialog('close');
+            if(result.status != "" && result.status == 'Done'){
+              $("#repeat-mode-dailog").dialog('close');
               $('#mainTabContainer div:visible Form').submit();
+            }else if(result.status != "" && result.status == 'Error'){
+              $("#repeat-mode-dailog").html('').append("<span id='error-text'>Some error ocurred, please try after some time</span>").css('color', 'red');
             }
+          }
         });
       }
     }