From cf0adfdc25d378146d6d035f52e4324fba444fa5 Mon Sep 17 00:00:00 2001 From: Camilo Rodriguez Date: Tue, 5 Dec 2017 16:34:23 +0000 Subject: [PATCH] CRM-21520: Fix Code Style Issues --- CRM/Case/Form/AddContact.php | 9 +++++---- CRM/Case/Form/AddToCaseAsRole.php | 7 ++++--- CRM/Case/FormBuilder.php | 5 +++-- CRM/Contact/BAO/Contact.php | 2 +- CRM/Contact/Task.php | 16 +++++++++------- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/CRM/Case/Form/AddContact.php b/CRM/Case/Form/AddContact.php index 810767786d..da93aabb6d 100644 --- a/CRM/Case/Form/AddContact.php +++ b/CRM/Case/Form/AddContact.php @@ -11,9 +11,9 @@ class CRM_Case_Form_AddContact extends CRM_Core_Form { public function postProcess() { $values = $this->controller->exportValues(); - $caseId = (int)$values['assign_to']; - $roleTypeId = (int)$values['role_type']; - $contacts = array((int)CRM_Utils_Request::retrieve('cid', 'Positive')); + $caseId = (int) $values['assign_to']; + $roleTypeId = (int) $values['role_type']; + $contacts = array((int) CRM_Utils_Request::retrieve('cid', 'Positive')); $clients = CRM_Case_BAO_Case::getCaseClients($caseId); @@ -21,11 +21,12 @@ class CRM_Case_Form_AddContact extends CRM_Core_Form { 'contact_id_a' => $clients[0], 'contact_id_b' => $contacts, 'case_id' => $caseId, - 'relationship_type_id' => $roleTypeId + 'relationship_type_id' => $roleTypeId, ); CRM_Contact_BAO_Relationship::createMultiple($params, 'a'); CRM_Core_Session::setStatus(ts('Contact has been added to case.'), 'Information', 'success'); } + } diff --git a/CRM/Case/Form/AddToCaseAsRole.php b/CRM/Case/Form/AddToCaseAsRole.php index 5085d66761..d8801ffd48 100644 --- a/CRM/Case/Form/AddToCaseAsRole.php +++ b/CRM/Case/Form/AddToCaseAsRole.php @@ -9,8 +9,8 @@ class CRM_Case_Form_AddToCaseAsRole extends CRM_Contact_Form_Task { public function postProcess() { $values = $this->controller->exportValues(); - $caseId = (int)$values['assign_to']; - $roleTypeId = (int)$values['role_type']; + $caseId = (int) $values['assign_to']; + $roleTypeId = (int) $values['role_type']; $contacts = $this->_contactIds; $clients = CRM_Case_BAO_Case::getCaseClients($caseId); @@ -19,7 +19,7 @@ class CRM_Case_Form_AddToCaseAsRole extends CRM_Contact_Form_Task { 'contact_id_a' => $clients[0], 'contact_id_b' => $contacts, 'case_id' => $caseId, - 'relationship_type_id' => $roleTypeId + 'relationship_type_id' => $roleTypeId, ); CRM_Contact_BAO_Relationship::createMultiple($params, 'a'); @@ -30,4 +30,5 @@ class CRM_Case_Form_AddToCaseAsRole extends CRM_Contact_Form_Task { ); CRM_Utils_System::redirect($url); } + } diff --git a/CRM/Case/FormBuilder.php b/CRM/Case/FormBuilder.php index b62707ee74..511aa1a6b6 100644 --- a/CRM/Case/FormBuilder.php +++ b/CRM/Case/FormBuilder.php @@ -24,8 +24,8 @@ class CRM_Case_FormBuilder { array( 'type' => 'submit', 'name' => ts('Submit'), - 'isDefault' => true - ) + 'isDefault' => TRUE, + ), )); } @@ -40,4 +40,5 @@ class CRM_Case_FormBuilder { } return $roleTypes; } + } diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php index be48686335..de5dbc6376 100644 --- a/CRM/Contact/BAO/Contact.php +++ b/CRM/Contact/BAO/Contact.php @@ -3110,7 +3110,7 @@ AND civicrm_openid.is_primary = 1"; 'href' => CRM_Utils_System::url('civicrm/case/add-contact', 'reset=1'), 'weight' => 100, 'ref' => 'add-to-case-as-role', - 'key' => 'add-to-case-as-role' + 'key' => 'add-to-case-as-role', ); CRM_Utils_Hook::summaryActions($menu, $contactId); diff --git a/CRM/Contact/Task.php b/CRM/Contact/Task.php index abe2c39d6d..f5bd5d8ecd 100644 --- a/CRM/Contact/Task.php +++ b/CRM/Contact/Task.php @@ -61,7 +61,8 @@ class CRM_Contact_Task { RESTORE = 23, DELETE_PERMANENTLY = 24, COMMUNICATION_PREFS = 25, - INDIVIDUAL_CONTACTS = 26; + INDIVIDUAL_CONTACTS = 26, + ADD_TO_CASE = 27; /** * The task array @@ -275,16 +276,17 @@ class CRM_Contact_Task { ); } - self::$_tasks[] = array( - 'title' => 'Add to case as role', - 'class' => 'CRM_Case_Form_AddToCaseAsRole', - 'result' => FALSE - ); + if (CRM_Core_Permission::access('CiviCase')) { + self::$_tasks[self::ADD_TO_CASE] = [ + 'title' => 'Add to case as role', + 'class' => 'CRM_Case_Form_AddToCaseAsRole', + 'result' => FALSE, + ]; + } self::$_tasks += CRM_Core_Component::taskList(); CRM_Utils_Hook::searchTasks('contact', self::$_tasks); - } } -- 2.25.1