Add basic entityRef support for activities

diff --git a/api/v3/Activity.php b/api/v3/Activity.php
index c7d033ec6a7face4fe37a68cd638ff51288be445..4e46c49e2fb450c7857f5923c5bb9d8336315a36 100644 (file)
--- a/api/v3/Activity.php
+++ b/api/v3/Activity.php
@@ -437,3 +437,50 @@ SELECT  count(*)
   return NULL;
 }
 
+/**
+ * @see _civicrm_api3_generic_getlist_params.
+ *
+ * @param $request array
+ */
+function _civicrm_api3_activity_getlist_params(&$request) {
+  $fieldsToReturn = array('activity_date_time', 'activity_type_id', 'subject', 'source_contact_id');
+  $request['params']['return'] = array_unique(array_merge($fieldsToReturn, $request['extra']));
+  $request['params']['options']['sort'] = 'activity_date_time DESC';
+  $request['params'] += array(
+    'is_current_revision' => 1,
+    'is_deleted' => 0,
+  );
+}
+
+/**
+ * @see _civicrm_api3_generic_getlist_output
+ *
+ * @param $result array
+ * @param $request array
+ *
+ * @return array
+ */
+function _civicrm_api3_activity_getlist_output($result, $request) {
+  $output = array();
+  if (!empty($result['values'])) {
+    foreach ($result['values'] as $row) {
+      $data = array(
+        'id' => $row[$request['id_field']],
+        'label' => $row[$request['label_field']] ? $row[$request['label_field']] : ts('(no subject)'),
+        'description' => array(CRM_Core_Pseudoconstant::getLabel('CRM_Activity_BAO_Activity', 'activity_type_id', $row['activity_type_id'])),
+      );
+      if (!empty($row['activity_date_time'])) {
+        $data['description'][0] .= ': ' . CRM_Utils_Date::customFormat($row['activity_date_time']);
+      }
+      if (!empty($row['source_contact_id'])) {
+        $data['description'][] = ts('By %1', array(1 => CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $row['source_contact_id'], 'display_name')));
+      }
+      foreach ($request['extra'] as $field) {
+        $data['extra'][$field] = isset($row[$field]) ? $row[$field] : NULL;
+      }
+      $output[] = $data;
+    }
+  }
+  return $output;
+}
+

diff --git a/api/v3/Generic/Getlist.php b/api/v3/Generic/Getlist.php
index 85c148929ea74256816f43457da212d70ef03c2a..b7383bb0f7c4bf028fa5c5cf6cc6eb7d5fe35cea 100644 (file)
--- a/api/v3/Generic/Getlist.php
+++ b/api/v3/Generic/Getlist.php
@@ -82,7 +82,7 @@ function _civicrm_api3_generic_getList_defaults($entity, &$request) {
     'extra' => array(),
   );
   // Find main field from meta
-  foreach (array('sort_name', 'title', 'label', 'name') as $field) {
+  foreach (array('sort_name', 'title', 'label', 'name', 'subject') as $field) {
     if (isset($fields[$field])) {
       $defaults['label_field'] = $defaults['search_field'] = $field;
       break;