From: unknown <priyanka.karan26@gmail.com>
Date: Sat, 6 Sep 2014 19:47:12 +0000 (+0100)
Subject: Function to delete relation from recurringentity, xml path correction for ajax calls
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8dc6e78aeb483d025df7ba46e7eb3d8ec2ecc0d0;p=civicrm-core.git

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 5fd14605b1..3622a4b0cb 100644
--- 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 e1f4a1d11d..bd681ea47b 100644
--- 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 64ffc375ba..bac9d23024 100644
--- 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>