From 5b7581f1a2d24c3f1087bbe1eb42df8f4655e018 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 5 Sep 2014 21:00:16 -0400 Subject: [PATCH] Add icon to 'file-on-case' button --- CRM/Activity/Form/Activity.php | 14 +++----------- templates/CRM/Activity/Form/Activity.tpl | 3 +++ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php index 798ff23ae8..28f9de52f2 100644 --- a/CRM/Activity/Form/Activity.php +++ b/CRM/Activity/Form/Activity.php @@ -278,6 +278,8 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task { $this->_activityTypeId = CRM_Utils_Request::retrieve('atype', 'Positive', $this); $this->assign('atype', $this->_activityTypeId); + $this->assign('activityId', $this->_activityId); + //check for required permissions, CRM-6264 if ($this->_activityId && in_array($this->_action, array( @@ -740,24 +742,14 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task { if (isset($this->_groupTree)) { CRM_Core_BAO_CustomGroup::buildCustomDataView($this, $this->_groupTree); } - $buttons = array(); - // do check for permissions - if (CRM_Case_BAO_Case::checkPermission($this->_activityId, 'File On Case', $this->_activityTypeId)) { - $buttons[] = array( - 'type' => 'cancel', - 'name' => ts('File on case'), - 'subName' => 'file_on_case', - 'js' => array('onClick' => "javascript:fileOnCase( \"file\", $this->_activityId ); return false;") - ); - } // form should be frozen for view mode $this->freeze(); + $buttons = array(); $buttons[] = array( 'type' => 'cancel', 'name' => ts('Done') ); - $this->addButtons($buttons); } else { diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl index 62bb3afe51..8d6a6a2441 100644 --- a/templates/CRM/Activity/Form/Activity.tpl +++ b/templates/CRM/Activity/Form/Activity.tpl @@ -281,6 +281,9 @@
{ts}Delete{/ts}
{/if} {/if} + {if $action eq 4 and call_user_func(array('CRM_Case_BAO_Case','checkPermission'), $activityId, 'File On Case', $atype)} +
{ts}File On Case{/ts}
+ {/if} {include file="CRM/common/formButtons.tpl" location="bottom"} -- 2.25.1