diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
index 2c66cdd4c82..3fa0e9113c6 100644
--- a/CRM/Case/BAO/Case.php
+++ b/CRM/Case/BAO/Case.php
@@ -1151,9 +1151,18 @@ public static function getCaseActivity($caseID, &$params, $contactID, $context =
// Activity Status Label for Case activities list
$caseActivities[$caseActivityId]['status_id'] = CRM_Core_PseudoConstant::getLabel('CRM_Activity_BAO_Activity', 'activity_status_id', $dao->status);
+ $deleted = '';
+ if ($dao->deleted) {
+ $deleted = '
' . ts('(deleted)');
+ }
+ $caseActivities[$caseActivityId]['status_id'] = CRM_Core_PseudoConstant::getLabel('CRM_Activity_BAO_Activity', 'activity_status_id', $dao->status) . $deleted;
+ // if there are file attachments we will return how many
+ if (!empty($dao->attachment_ids)) {
+ $attachmentIDs = array_unique(explode(',', $dao->attachment_ids));
+ $caseActivity['no_attachments'] = count($attachmentIDs);
+ }
- $caseActivities[$caseActivityId]
- = self::addCaseActivityLinks($caseID, $contactID, $userID, $context, $dao, $caseActivities[$caseActivityId]);
+ $caseActivities[$caseActivityId]['links'] = self::addCaseActivityLinks($caseID, $contactID, $userID, $context, $dao);
}
$caseActivitiesDT = array();
@@ -1173,11 +1182,11 @@ public static function getCaseActivity($caseID, &$params, $contactID, $context =
* @param int $userID
* @param string $context
* @param \CRM_Core_DAO $dao
- * @param array $caseActivity
*
- * @return array caseActivity
+ * @return string
+ * HTML formatted Link
*/
- public static function addCaseActivityLinks($caseID, $contactID, $userID, $context, $dao, $caseActivity) {
+ private static function addCaseActivityLinks($caseID, $contactID, $userID, $context, $dao) {
// FIXME: Why are we not using CRM_Core_Action for these links? This is too much manual work and likely to get out-of-sync with core markup.
$caseActivityId = $dao->id;
$allowView = self::checkPermission($caseActivityId, 'view', $dao->activity_type_id, $userID);
@@ -1221,7 +1230,6 @@ public static function addCaseActivityLinks($caseID, $contactID, $userID, $conte
}
elseif (!$caseDeleted) {
$url = ' ' . ts('Restore') . '';
- $caseActivity['status_id'] = $caseActivity['status_id'] . '
(deleted)';
}
//check for operations.
@@ -1233,12 +1241,10 @@ public static function addCaseActivityLinks($caseID, $contactID, $userID, $conte
}
// if there are file attachments we will return how many and, if only one, add a link to it
if (!empty($dao->attachment_ids)) {
- $attachmentIDs = array_unique(explode(',', $dao->attachment_ids));
- $caseActivity['no_attachments'] = count($attachmentIDs);
$url .= implode(' ', CRM_Core_BAO_File::paperIconAttachment('civicrm_activity', $caseActivityId));
}
- $caseActivity['links'] = $url;
- return $caseActivity;
+
+ return $url;
}
/**
diff --git a/CRM/Case/Selector/Search.php b/CRM/Case/Selector/Search.php
index 55c396e60ee..8d63a8ea292 100644
--- a/CRM/Case/Selector/Search.php
+++ b/CRM/Case/Selector/Search.php
@@ -322,7 +322,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
$isDeleted = FALSE;
if ($result->case_deleted) {
$isDeleted = TRUE;
- $row['case_status_id'] = empty($row['case_status_id']) ? "" : $row['case_status_id'] . '
(deleted)';
+ $row['case_status_id'] = empty($row['case_status_id']) ? "" : $row['case_status_id'] . '
' . ts('(deleted)');
}
$scheduledInfo['case_id'][] = $result->case_id;