'name' => 'assignee_id',
'title' => 'assigned to',
'type' => 1,
- 'FKClassName' => 'CRM_Activity_DAO_ActivityAssignment',
+ 'FKClassName' => 'CRM_Activity_DAO_ActivityContact',
);
$params['target_contact_id'] = array(
'name' => 'target_id',
'title' => 'Activity Target',
'type' => 1,
- 'FKClassName' => 'CRM_Activity_DAO_ActivityTarget',
+ 'FKClassName' => 'CRM_Activity_DAO_ActivityContact',
);
- $params['activity_status_id'] = array(
- 'name' => 'status_id',
- 'title' => 'Status Id',
- 'type' => 1,
+
+ $params['source_contact_id'] = array(
+ 'name' => 'source_contact_id',
+ 'title' => 'Activity Source Contact',
+ 'type' => 1,
+ 'FKClassName' => 'CRM_Activity_DAO_ActivityContact',
+ 'api.default' => 'user_contact_id',
);
+
}
/**
$returns[$returnkey] = $v;
}
}
-
+ $returns['source_contact_id'] = 1;
foreach ($returns as $n => $v) {
switch ($n) {
case 'assignee_contact_id':
$activities[$key]['target_contact_id'] = CRM_Activity_BAO_ActivityTarget::retrieveTargetIdsByActivityId($activityArray['id']);
}
break;
+ case 'source_contact_id':
+ foreach ($activities as $key => $activityArray) {
+ $activities[$key]['source_contact_id'] = CRM_Activity_BAO_Activity::getSourceContactID($activityArray['id']);
+ }
+ break;
default:
if (substr($n, 0, 6) == 'custom') {
$returnProperties[$n] = $v;
}
if (!empty($activities) && (!empty($returnProperties) || !empty($params['contact_id']))) {
foreach ($activities as $activityId => $values) {
-
_civicrm_api3_custom_data_get($activities[$activityId], 'Activity', $activityId, NULL, $values['activity_type_id']);
}
}
return civicrm_api3_create_success($activities, $params, 'activity', 'get');
}
+
+
/**
* Delete a specified Activity.
*
function _civicrm_api3_activity_check_params(&$params) {
$contactIDFields = array_intersect_key($params,
- array(
- 'source_contact_id' => 1,
- 'assignee_contact_id' => 1,
- 'target_contact_id' => 1,
- )
+ array(
+ 'source_contact_id' => 1,
+ 'assignee_contact_id' => 1,
+ 'target_contact_id' => 1,
+ )
);
- // this should be handled by wrapper layer & probably the api would already manage it
- //correctly by doing post validation - ie. a failure should result in a roll-back = an error
- // needs testing
+
+ // this should be handled by wrapper layer & probably the api would already manage it
+ //correctly by doing post validation - ie. a failure should result in a roll-back = an error
+ // needs testing
if (!empty($contactIDFields)) {
$contactIds = array();
foreach ($contactIDFields as $fieldname => $contactfield) {
$activityIds = array('activity' => CRM_Utils_Array::value('id', $params),
- 'parent' => CRM_Utils_Array::value('parent_id', $params),
- 'original' => CRM_Utils_Array::value('original_id', $params),
+ 'parent' => CRM_Utils_Array::value('parent_id', $params),
+ 'original' => CRM_Utils_Array::value('original_id', $params),
);
foreach ($activityIds as $id => $value) {
return civicrm_api3_create_error('Invalid Activity Type ID');
}
- // check for activity status is passed in
- // note this should all be removed in favour of wrapper layer validation
- // needs testing
- if (isset($params['activity_status_id'])) {
- $activityStatus = CRM_Core_PseudoConstant::activityStatus();
-
- if (is_numeric($params['activity_status_id']) && !array_key_exists($params['activity_status_id'], $activityStatus)) {
- return civicrm_api3_create_error('Invalid Activity Status');
- }
- elseif (!is_numeric($params['activity_status_id'])) {
- $statusId = array_search($params['activity_status_id'], $activityStatus);
-
- if (!is_numeric($statusId)) {
- return civicrm_api3_create_error('Invalid Activity Status');
- }
- }
- }
-
-
-
// check for activity duration minutes
// this should be validated @ the wrapper layer not here
// needs testing