Moved function updateModeRecurringEntityForEvent to ManageEvent/Repeat.php

diff --git a/CRM/Core/Page/AJAX/RecurringEntity.php b/CRM/Core/Page/AJAX/RecurringEntity.php
index 26b4b5ecd36bf211a50625bd9c6fd7bffe9d6c02..1bdc309356b1677f533bf4497ccde0c7369cb0ec 100644 (file)
--- a/CRM/Core/Page/AJAX/RecurringEntity.php
+++ b/CRM/Core/Page/AJAX/RecurringEntity.php
@@ -24,7 +24,7 @@ class CRM_Core_Page_AJAX_RecurringEntity {
 
       if(CRM_Utils_Array::value('linkedEntityTable', $_REQUEST)){
         $result = array();
-        $result = CRM_Event_BAO_Event::updateModeRecurringEntityForEvent($entityId, $_REQUEST['linkedEntityTable']);
+        $result = CRM_Event_Form_ManageEvent_Repeat::updateModeRecurringEntityForEvent($entityId, $_REQUEST['linkedEntityTable']);
       }
 
       $dao = new CRM_Core_DAO_RecurringEntity();

diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php
index 375debdc75f352f69ef64559f8b688f07802388d..a427b5a4dd6240bbcabe8a54ec5a1effbf39080a 100644 (file)
--- a/CRM/Event/BAO/Event.php
+++ b/CRM/Event/BAO/Event.php
@@ -2201,49 +2201,4 @@ LEFT  JOIN  civicrm_price_field_value value ON ( value.id = lineItem.price_field
     return CRM_Core_PseudoConstant::get(__CLASS__, $fieldName, $params, $context);
   }
   
-  /**
-   * Update mode column in civicrm_recurring_entity table for event related tabs
-   * 
-   * @params int $entityId event id
-   * @params string $linkedEntityTable Linked entity table name for this event
-   * @return array
-   */
-  public static function updateModeRecurringEntityForEvent($entityId, $linkedEntityTable){
-    $result = array();
-    if( $entityId && $linkedEntityTable ){
-      switch ($linkedEntityTable) {
-        case 'civicrm_tell_friend':
-          $dao = 'CRM_Friend_DAO_Friend';
-          $entityTable = 'civicrm_tell_friend';
-          break;
-
-        case 'civicrm_pcp_block':
-          $dao = 'CRM_PCP_DAO_PCPBlock';
-          $entityTable = 'civicrm_pcp_block';
-          break;
-
-        case 'civicrm_price_set_entity':
-          $dao = 'CRM_Price_DAO_PriceSetEntity';
-          $entityTable = 'civicrm_price_set_entity';
-          break;
-
-        case 'civicrm_uf_join':
-          $dao = 'CRM_Core_DAO_UFJoin';
-          $entityTable = 'civicrm_uf_join';
-          break;
-        }
-        $params = array(
-                        'entity_id' => $entityId,
-                        'entity_table' => 'civicrm_event'
-                      );
-        $defaults = array();
-        CRM_Core_DAO::commonRetrieve($dao, $params, $defaults);
-        if(CRM_Utils_Array::value('id', $defaults)){
-          $result['entityId'] = $defaults['id'];
-          $result['entityTable'] = $entityTable;
-        }
-      } 
-      return $result;
-    }
-}
-
+}
\ No newline at end of file

diff --git a/CRM/Event/Form/ManageEvent/Repeat.php b/CRM/Event/Form/ManageEvent/Repeat.php
index a70258c81663932bc88114045ed1214d7f212ae8..58b1245357ae36fb923bdfe783c71873c274e6b6 100644 (file)
--- a/CRM/Event/Form/ManageEvent/Repeat.php
+++ b/CRM/Event/Form/ManageEvent/Repeat.php
@@ -253,6 +253,50 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
       $dao->fetch();
     }
     return $dao;
-  }  
+  }
   
+   /**
+   * Update mode column in civicrm_recurring_entity table for event related tabs
+   * 
+   * @params int $entityId event id
+   * @params string $linkedEntityTable Linked entity table name for this event
+   * @return array
+   */
+  public static function updateModeRecurringEntityForEvent($entityId, $linkedEntityTable){
+    $result = array();
+    if( $entityId && $linkedEntityTable ){
+      switch ($linkedEntityTable) {
+        case 'civicrm_tell_friend':
+          $dao = 'CRM_Friend_DAO_Friend';
+          $entityTable = 'civicrm_tell_friend';
+          break;
+
+        case 'civicrm_pcp_block':
+          $dao = 'CRM_PCP_DAO_PCPBlock';
+          $entityTable = 'civicrm_pcp_block';
+          break;
+
+        case 'civicrm_price_set_entity':
+          $dao = 'CRM_Price_DAO_PriceSetEntity';
+          $entityTable = 'civicrm_price_set_entity';
+          break;
+
+        case 'civicrm_uf_join':
+          $dao = 'CRM_Core_DAO_UFJoin';
+          $entityTable = 'civicrm_uf_join';
+          break;
+        }
+        $params = array(
+                        'entity_id' => $entityId,
+                        'entity_table' => 'civicrm_event'
+                      );
+        $defaults = array();
+        CRM_Core_DAO::commonRetrieve($dao, $params, $defaults);
+        if(CRM_Utils_Array::value('id', $defaults)){
+          $result['entityId'] = $defaults['id'];
+          $result['entityTable'] = $entityTable;
+        }
+    } 
+    return $result;
+  }  
 }