worked on CRM-12216, fixed subject and added option for bulk action

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index e47154efd45ac6833747513850198eaa9d78ee4f..bee06e27af8c2ff976714a9ab56299f45674de3a 100644 (file)
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -741,8 +741,8 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
     $this->assign('surveyActivity', $this->_isSurveyActivity);
 
     // this option should be available only during add mode
-    if ($this->_action & CRM_Core_Action::ADD) {
-      $this->add('advcheckbox', 'is_multi_activity', ts('Create a separate activity for each selected contact?'));
+    if ($this->_action != CRM_Core_Action::UPDATE) {
+      $this->add('advcheckbox', 'is_multi_activity', ts('Create a separate activity for each of the above selected contact.'));
     }
 
     $this->addRule('duration',
@@ -1143,13 +1143,14 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
     }
 
     // set status message
+    $subject = '';
     if (CRM_Utils_Array::value('subject', $params)) {
-      $params['subject'] = "'" . $params['subject'] . "'";
+      $subject = "'" . $params['subject'] . "'";
     }
 
     CRM_Core_Session::setStatus(ts('Activity %1 has been saved. %2. %3',
       array(
-        1 => $params['subject'],
+        1 => $subject,
         2 => $followupStatus,
         3 => $mailStatus
       )

diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index ec16caf04c41fddb3252f479c4a248b05a3b08cd..5e2ae08ef07caaee2f81bcbd3c643c87d69fceb8 100644 (file)
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -127,7 +127,11 @@
   <tr class="crm-activity-form-block-target_contact_id">
     {if $single eq false}
       <td class="label">{ts}With Contact(s){/ts}</td>
-      <td class="view-value" style="white-space: normal">{$with|escape}</td>
+      <td class="view-value" style="white-space: normal">
+        {$with|escape}
+        <br/>
+        {$form.is_multi_activity.html}&nbsp;{$form.is_multi_activity.label}
+      </td>
       {elseif $action neq 4}
       <td class="label">{ts}With Contact{/ts}</td>
       <td class="view-value">