From 050fc124ac75bdf012b8c6afc29a826ceb07966c Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 2 Apr 2014 15:08:09 -0400 Subject: [PATCH] CRM-13966 - Refactor activityToCase tokeninput to select2 --- CRM/Case/Form/ActivityToCase.php | 21 ++----- templates/CRM/Case/Form/ActivityToCase.tpl | 70 ++++++---------------- 2 files changed, 23 insertions(+), 68 deletions(-) diff --git a/CRM/Case/Form/ActivityToCase.php b/CRM/Case/Form/ActivityToCase.php index f6152800f1..85f56d9155 100644 --- a/CRM/Case/Form/ActivityToCase.php +++ b/CRM/Case/Form/ActivityToCase.php @@ -65,17 +65,12 @@ class CRM_Case_Form_ActivityToCase extends CRM_Core_Form { * @return array */ function setDefaultValues() { - $targetContactValues = $defaults = array(); + $defaults = array(); $params = array('id' => $this->_activityId); CRM_Activity_BAO_Activity::retrieve($params, $defaults); - $defaults['case_activity_subject'] = $defaults['subject']; - if (!CRM_Utils_Array::crmIsEmptyArray($defaults['target_contact'])) { - $targetContactValues = array_combine(array_unique($defaults['target_contact']), - explode(';', trim($defaults['target_contact_value'])) - ); - } - $this->assign('targetContactValues', empty($targetContactValues) ? FALSE : $targetContactValues); + $defaults['file_on_case_activity_subject'] = $defaults['subject']; + $defaults['file_on_case_target_contact_id'] = $defaults['target_contact']; return $defaults; } @@ -87,13 +82,9 @@ class CRM_Case_Form_ActivityToCase extends CRM_Core_Form { * @access public */ public function buildQuickForm() { - // tokeninput url - $tokenUrl = CRM_Utils_System::url("civicrm/ajax/checkemail", "noemail=1", FALSE, NULL, FALSE); - $this->assign('tokenUrl', $tokenUrl); - - $this->add('text', 'unclosed_case_id', ts('Select Case'), array('class' => 'huge'), TRUE); - $this->add('text', 'target_contact_id', ts('With Contact(s)')); - $this->add('text', 'case_activity_subject', ts('Subject'), array('size' => 50)); + $this->add('text', 'file_on_case_unclosed_case_id', ts('Select Case'), array('class' => 'huge'), TRUE); + $this->addEntityRef('file_on_case_target_contact_id', ts('With Contact(s)'), array('multiple' => TRUE)); + $this->add('text', 'file_on_case_activity_subject', ts('Subject'), array('size' => 50)); } } diff --git a/templates/CRM/Case/Form/ActivityToCase.tpl b/templates/CRM/Case/Form/ActivityToCase.tpl index 1b7abd8d65..c54400fa54 100644 --- a/templates/CRM/Case/Form/ActivityToCase.tpl +++ b/templates/CRM/Case/Form/ActivityToCase.tpl @@ -27,17 +27,17 @@ {if !empty($buildCaseActivityForm)}
- - - + + + - - - + + + - - - + + @@ -45,12 +45,8 @@ {literal}
{$form.unclosed_case_id.label}{$form.unclosed_case_id.html}
{$form.file_on_case_unclosed_case_id.label}{$form.file_on_case_unclosed_case_id.html}
{$form.target_contact_id.label}{$form.target_contact_id.html}
{$form.file_on_case_target_contact_id.label}{$form.file_on_case_target_contact_id.html}
{$form.case_activity_subject.label}{$form.case_activity_subject.html}
+
{$form.file_on_case_activity_subject.label}{$form.file_on_case_activity_subject.html}
{ts}You can modify the activity subject before filing.{/ts}