From 598e9b75352b42b9f18fc4c9110a32868696f24e Mon Sep 17 00:00:00 2001
From: Sean Madsen <sean@seanmadsen.com>
Date: Sun, 3 Dec 2017 18:20:03 -0500
Subject: [PATCH] CRM-21507 Improve Activity Separation field logic

Only display the this field on the form if it's defined in the form
class. Only define it in the form class if the class property says to do
so.
---
 CRM/Activity/Form/Activity.php           | 6 ++++--
 templates/CRM/Activity/Form/Activity.tpl | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index 53e64c546d..8c96bc205e 100644
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -719,8 +719,10 @@ 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::UPDATE) {
+    // Add the "Activity Separation" field
+    $actionIsAdd = $this->_action != CRM_Core_Action::UPDATE;
+    $separationIsPossible = $this->supportsActivitySeparation;
+    if ($actionIsAdd && $separationIsPossible) {
       $this->addRadio(
         'separation',
         ts('Activity Separation'),
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index 4365241d03..1d88c441d6 100644
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -81,7 +81,7 @@
     </td>
   </tr>
 
-  {if $action eq 1 or $single eq false}
+  {if $form.separation }
     <tr class="crm-activity-form-block-separation crm-is-multi-activity-wrapper">
       <td class="label">{$form.separation.label}</td>
       <td>{$form.separation.html} {help id="separation"}</td>
-- 
2.25.1