From ab911378295bff5e3b4241d8bba48a677c2b6728 Mon Sep 17 00:00:00 2001 From: Pratik Joshi Date: Mon, 19 May 2014 13:50:10 +0530 Subject: [PATCH] CRM-14704 fix: in this fix, the selected records are editable on activity form --- CRM/Activity/Form/Activity.php | 5 ++++- templates/CRM/Activity/Form/Activity.tpl | 16 ++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php index c46a3e631d..3f53d8c600 100644 --- 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 3352d73091..ae3021e18b 100644 --- a/templates/CRM/Activity/Form/Activity.tpl +++ b/templates/CRM/Activity/Form/Activity.tpl @@ -78,14 +78,14 @@ - {$form.target_contact_id.label} - - {$form.target_contact_id.html} - {if $action eq 1} -
- {$form.is_multi_activity.html} {$form.is_multi_activity.label} {help id="id-is_multi_activity"} - {/if} - + {$form.target_contact_id.label} + + {$form.target_contact_id.html} + {if $action eq 1 or $single eq false} +
+ {$form.is_multi_activity.html} {$form.is_multi_activity.label} {help id="id-is_multi_activity"} + {/if} + -- 2.25.1