Api Break fixes

civicrm · Jan 28, 2015 · 3c151c7 · 3c151c7
1 parent 4de9f93
commit 3c151c7
Show file tree

Hide file tree

Showing 10 changed files with 223 additions and 297 deletions.
diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
@@ -1443,7 +1443,7 @@ public static function fixDateValues($relative, &$from, &$to) {
    *
    * @return array
    */
-  public static function convertFormValues(&$formValues, $wildcard = 0, $useEquals = FALSE) {
+  static function convertFormValues(&$formValues, $wildcard = 0, $useEquals = FALSE, $apiEntity = NULL) {
     $params = array();
     if (empty($formValues)) {
       return $params;
@@ -1494,7 +1494,7 @@ public static function convertFormValues(&$formValues, $wildcard = 0, $useEquals
         }
       }
       else {
-        $values = CRM_Contact_BAO_Query::fixWhereValues($id, $values, $wildcard, $useEquals);
+        $values = CRM_Contact_BAO_Query::fixWhereValues($id, $values, $wildcard, $useEquals, $apiEntity);
 
         if (!$values) {
           continue;
@@ -1513,7 +1513,7 @@ public static function convertFormValues(&$formValues, $wildcard = 0, $useEquals
    *
    * @return array|null
    */
-  public static function &fixWhereValues($id, &$values, $wildcard = 0, $useEquals = FALSE) {
+  static function &fixWhereValues($id, &$values, $wildcard = 0, $useEquals = FALSE, $apiEntity = NULL) {
     // skip a few search variables
     static $skipWhere = NULL;
     static $likeNames = NULL;
@@ -1542,6 +1542,10 @@ public static function &fixWhereValues($id, &$values, $wildcard = 0, $useEquals
       return $result;
     }
 
+    if ($apiEntity) {
+      $id = $apiEntity . '_' . $id;
+    }
+
     if (!$likeNames) {
       $likeNames = array('sort_name', 'email', 'note', 'display_name');
     }

diff --git a/CRM/Contact/Form/Search/Advanced.php b/CRM/Contact/Form/Search/Advanced.php
@@ -364,15 +364,18 @@ public function normalizeFormValues() {
       }
     }
 
-    // CRM-13848
-    $financialType = CRM_Utils_Array::value('financial_type_id', $this->_formValues);
-    if ($financialType && is_array($financialType)) {
-      unset($this->_formValues['financial_type_id']);
-      foreach ($financialType as $notImportant => $typeID) {
-        $this->_formValues['financial_type_id'][$typeID] = 1;
+    foreach (array('financial_type_id', 'contribution_soft_credit_type_id', 'contribution_status') as $element) {
+      $value = CRM_Utils_Array::value($element, $this->_formValues);
+      if ($value && is_array($value)) {
+        $this->_formValues[$element] = array('IN' => $value);
       }
     }
 
+    foreach (array('contribution_source', 'contribution_trxn_id') as $element) {
+      $value = CRM_Utils_Array::value($element, $this->_formValues);
+      $this->_formValues[$element] = array('LIKE' => "%$value%");
+    }
+
     $taglist = CRM_Utils_Array::value('contact_taglist', $this->_formValues);
 
     if ($taglist && is_array($taglist)) {

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
@@ -648,6 +648,14 @@ public static function &exportableFields() {
         ),
       );
 
+      $contributionPage = array(
+        'contribution_page' => array(
+          'title' => ts('Contribution Page'),
+          'name' => 'contribution_page',
+          'where' => 'civicrm_contribution_page.title',
+          'data_type' => CRM_Utils_Type::T_STRING
+        ));
+
       $contributionNote = array(
         'contribution_note' =>
           array(
@@ -699,7 +707,7 @@ public static function &exportableFields() {
         ),
       );
 
-      $fields = array_merge($impFields, $typeField, $contributionStatus, $optionField, $expFieldProduct,
+      $fields = array_merge($impFields, $typeField, $contributionStatus, $contributionPage, $optionField, $expFieldProduct,
         $expFieldsContrib, $contributionNote, $contributionRecurId, $extraFields, $softCreditFields, $financialAccount,
         CRM_Core_BAO_CustomField::getFieldsForImport('Contribution')
       );