Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-14-13-42-39

[civicrm-core.git] / CRM / Case / Form / ActivityToCase.php

diff --git a/CRM/Case/Form/ActivityToCase.php b/CRM/Case/Form/ActivityToCase.php
index 3397eea2a422a1d0665774e256aed752459158a2..85f56d91558b3404ef953481a1f422ad3fb0aeb1 100644 (file)
--- a/CRM/Case/Form/ActivityToCase.php
+++ b/CRM/Case/Form/ActivityToCase.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -42,7 +42,7 @@ class CRM_Case_Form_ActivityToCase extends CRM_Core_Form {
   /**
    * build all the data structures needed to build the form.
    *
-   * @return None
+   * @return void
    * @access public
    */
   function preProcess() {
@@ -62,20 +62,15 @@ class CRM_Case_Form_ActivityToCase extends CRM_Core_Form {
    *
    * @access public
    *
-   * @return None
+   * @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;
   }
@@ -83,18 +78,13 @@ class CRM_Case_Form_ActivityToCase extends CRM_Core_Form {
   /**
    * Function to build the form
    *
-   * @return None
+   * @return void
    * @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_cases', ts('Select Case'));
-    $this->add('hidden', 'unclosed_case_id', '', array('id' => 'open_case_id'));
-    $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));
   }
 }