Merge pull request #2341 from colemanw/campaign_id

CRM-13810 - Display campaign name on search builder

CRM/Campaign/BAO/Query.php

@@ -85,6 +85,19 @@ class CRM_Campaign_BAO_Query {
         }
       }
     }
+    // CRM-13810 Translate campaign_id to label for search builder
+    if (is_array($query->_select)) {
+      foreach($query->_select as $field => $queryString) {
+        if (substr($field, -11) == 'campaign_id') {
+          $query->_pseudoConstantsSelect[$field] = array(
+            'pseudoField' => 'campaign_id',
+            'idCol' => $field,
+            'bao' => 'CRM_Activity_BAO_Activity',
+          );
+        }
+      }
+    }
+
 
     //get survey clause in force,
     //only when we have survey id.

CRM/Contribute/BAO/Contribution.php

@@ -581,12 +581,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
         ));
 
       $extraFields = array(
-        'contribution_campaign' =>
-        array(
-          'title' => ts('Campaign Title')
-        ),
-        'contribution_batch' =>
-        array(
+        'contribution_batch' => array(
           'title' => ts('Batch Name')
         )
       );