CRM-14704 fix: in this fix, the selected records are editable on activity form

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index c46a3e631d2032dc117c2855525fe701ce207039..3f53d8c60098ce3e9ab19b999ed2ee8f06c07deb 100644 (file)
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -516,7 +516,6 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
     }
 
     $defaults = $this->_values;
-
     // if we're editing...
     if (isset($this->_activityId)) {
       if (empty($defaults['activity_date_time'])) {
@@ -561,6 +560,10 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
       $defaults['activity_type_id'] = $this->_activityTypeId;
     }
 
+    if (!$this->_single && !empty($this->_contactIds)) {
+      $defaults['target_contact_id'] = $this->_contactIds;
+    }
+
     if ($this->_action & (CRM_Core_Action::DELETE | CRM_Core_Action::RENEW)) {
       $this->assign('delName', CRM_Utils_Array::value('subject', $defaults));
     }

diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index 3352d73091f42545ff54b6d21d3a1939a605ae39..ae3021e18b57283d27983680eaa228731bae1332 100644 (file)
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -78,14 +78,14 @@
   </tr>
 
   <tr class="crm-activity-form-block-target_contact_id">
-      <td class="label">{$form.target_contact_id.label}</td>
-      <td class="view-value">
-        {$form.target_contact_id.html}
-        {if $action eq 1}
-        <br/>
-        {$form.is_multi_activity.html}&nbsp;{$form.is_multi_activity.label} {help id="id-is_multi_activity"}
-        {/if}
-      </td>
+  <td class="label">{$form.target_contact_id.label}</td>
+    <td class="view-value">
+      {$form.target_contact_id.html}
+      {if $action eq 1 or $single eq false}
+      <br/>
+      {$form.is_multi_activity.html}&nbsp;{$form.is_multi_activity.label} {help id="id-is_multi_activity"}
+      {/if}
+    </td>
   </tr>
 
   <tr class="crm-activity-form-block-assignee_contact_id">