X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCase%2FForm%2FActivityView.php;h=5276e243f7eac30f9b955c849edc498e71f942d0;hb=671232003fc7b673140e5407287b6a06af97c15d;hp=e690d59b9da974fbdc9dcab1f610404eb96f70e5;hpb=8282c3dc7b991acb4665546aae5c18e1adaecf95;p=civicrm-core.git diff --git a/CRM/Case/Form/ActivityView.php b/CRM/Case/Form/ActivityView.php index e690d59b9d..5276e243f7 100644 --- a/CRM/Case/Form/ActivityView.php +++ b/CRM/Case/Form/ActivityView.php @@ -3,7 +3,7 @@ +--------------------------------------------------------------------+ | CiviCRM version 5 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2019 | + | Copyright CiviCRM LLC (c) 2004-2020 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -28,7 +28,7 @@ /** * * @package CRM - * @copyright CiviCRM LLC (c) 2004-2019 + * @copyright CiviCRM LLC (c) 2004-2020 */ /** @@ -66,31 +66,31 @@ class CRM_Case_Form_ActivityView extends CRM_Core_Form { $attachmentUrl = CRM_Core_BAO_File::attachmentInfo('civicrm_activity', $activityID); if ($attachmentUrl) { - $report['fields'][] = array( + $report['fields'][] = [ 'label' => 'Attachment(s)', 'value' => $attachmentUrl, 'type' => 'Link', - ); + ]; } $tags = CRM_Core_BAO_EntityTag::getTag($activityID, 'civicrm_activity'); if (!empty($tags)) { - $allTag = CRM_Core_PseudoConstant::get('CRM_Core_DAO_EntityTag', 'tag_id', array('onlyActive' => FALSE)); + $allTag = CRM_Core_PseudoConstant::get('CRM_Core_DAO_EntityTag', 'tag_id', ['onlyActive' => FALSE]); foreach ($tags as $tid) { $tags[$tid] = $allTag[$tid]; } - $report['fields'][] = array( + $report['fields'][] = [ 'label' => 'Tags', 'value' => implode('
', $tags), 'type' => 'String', - ); + ]; } $this->assign('report', $report); $latestRevisionID = CRM_Activity_BAO_Activity::getLatestActivityId($activityID); - $viewPriorActivities = array(); + $viewPriorActivities = []; $priorActivities = CRM_Activity_BAO_Activity::getPriorAcitivities($activityID); foreach ($priorActivities as $activityId => $activityValues) { if (CRM_Case_BAO_Case::checkPermission($activityId, 'view', NULL, $contactID)) { @@ -152,7 +152,7 @@ class CRM_Case_Form_ActivityView extends CRM_Core_Form { $title = $title . $recentContactDisplay . ' (' . $activityTypes[$activityTypeID] . ')'; - $recentOther = array(); + $recentOther = []; if (CRM_Case_BAO_Case::checkPermission($activityID, 'edit')) { $recentOther['editUrl'] = CRM_Utils_System::url('civicrm/case/activity', "reset=1&action=update&id={$activityID}&cid={$recentContactId}&caseid={$caseID}&context=home" @@ -204,6 +204,17 @@ class CRM_Case_Form_ActivityView extends CRM_Core_Form { ], ]; CRM_Utils_System::appendBreadCrumb($breadcrumb); + + $this->addButtons([ + [ + 'type' => 'cancel', + 'name' => ts('Done'), + ], + ]); + // Add additional action links + $activityDeleted = CRM_Core_DAO::getFieldValue('CRM_Activity_DAO_Activity', $activityID, 'is_deleted'); + $actionLinks = CRM_Case_Selector_Search::permissionedActionLinks($caseID, $contactID, CRM_Core_Session::getLoggedInContactID(), NULL, $activityTypeID, $activityDeleted, $activityID, FALSE); + $this->assign('actionLinks', $actionLinks); } }