Function to delete relation from recurringentity, xml path correction for ajax calls

diff --git a/CRM/Core/BAO/RecurringEntity.php b/CRM/Core/BAO/RecurringEntity.php
index 5fd14605b1b145c2d551b17316f0bba35231cacd..3622a4b0cb5d4a8d98e4ea928aeecbb14b20a2f1 100644 (file)
--- a/CRM/Core/BAO/RecurringEntity.php
+++ b/CRM/Core/BAO/RecurringEntity.php
@@ -488,5 +488,17 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
       }
     }
   }
+  
+  static public function delEntityRelations($entityId, $entityTable){
+    if(!$entityId && !$entityTable){
+      return FALSE;
+    }
+    $parentID = self::getParentFor($entityId, $entityTable);
+    if($parentID){
+      $dao = new CRM_Core_DAO_RecurringEntity();
+      $dao->parent_id = $parentID;
+      return $dao->delete();
+    }
+  }
     
 }

diff --git a/CRM/Core/xml/Menu/Misc.xml b/CRM/Core/xml/Menu/Misc.xml
index e1f4a1d11d43694c01890bdc8514851933ac1a95..bd681ea47b34fb325bd24d4dc5e69949a5622b4f 100644 (file)
--- a/CRM/Core/xml/Menu/Misc.xml
+++ b/CRM/Core/xml/Menu/Misc.xml
@@ -175,4 +175,14 @@
     <page_callback>CRM_Core_Page_Angular</page_callback>
     <access_arguments>access CiviCRM</access_arguments>
   </item>
+  <item>
+     <path>civicrm/ajax/recurringEntity/update_cascade_type</path>
+     <page_callback>CRM_Core_Page_AJAX_RecurringEntity::updateCascadeType</page_callback>
+     <access_arguments>access CiviCRM,access CiviEvent</access_arguments>
+  </item>
+  <item>
+     <path>civicrm/ajax/recurringEntity/generate_preview</path>
+     <page_callback>CRM_Core_Page_AJAX_RecurringEntity::generatePreview</page_callback>
+     <access_arguments>access CiviCRM,access CiviEvent</access_arguments>
+  </item>
 </menu>

diff --git a/CRM/Event/xml/Menu/Event.xml b/CRM/Event/xml/Menu/Event.xml
index 64ffc375ba2a951b469e49ee1dd46d51ef44bd1c..bac9d23024d3cfbf9fb3e14a42e0aa5d1142011b 100644 (file)
--- a/CRM/Event/xml/Menu/Event.xml
+++ b/CRM/Event/xml/Menu/Event.xml
@@ -326,14 +326,4 @@
     <page_callback>CRM_Event_Form_ParticipantFeeSelection</page_callback>
     <access_arguments>access CiviEvent</access_arguments>
   </item>
-  <item>
-     <path>civicrm/ajax/recurringEntity/update_cascade_type</path>
-     <page_callback>CRM_Core_Page_AJAX_RecurringEntity::updateCascadeType</page_callback>
-     <access_arguments>access CiviCRM,access CiviEvent</access_arguments>
-  </item>
-  <item>
-     <path>civicrm/ajax/recurringEntity/generate_preview</path>
-     <page_callback>CRM_Core_Page_AJAX_RecurringEntity::generatePreview</page_callback>
-     <access_arguments>access CiviCRM,access CiviEvent</access_arguments>
-  </item>
 </menu>