Merge pull request #14522 from colemanw/ActivityForm

ActivityForm - Redirect to contact page or activity view in standalone mode
civicrm · Jun 14, 2019 · ba0022f · ba0022f
2 parents 204a280 + 70f3519
commit ba0022f
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
@@ -992,6 +992,17 @@ public function postProcess($params = NULL) {
       $activity = $this->processActivity($params);
     }
 
+    // Redirect to contact page or activity view in standalone mode
+    if ($this->_context == 'standalone') {
+      if (count($params['target_contact_id']) == 1) {
+        $url = CRM_Utils_System::url('civicrm/contact/view', ['cid' => CRM_Utils_Array::first($params['target_contact_id']), 'selectedChild' => 'activity']);
+      }
+      else {
+        $url = CRM_Utils_System::url('civicrm/activity', ['action' => 'view', 'reset' => 1, 'id' => $this->_activityId]);
+      }
+      CRM_Core_Session::singleton()->pushUserContext($url);
+    }
+
     $activityIds = empty($this->_activityIds) ? [$this->_activityId] : $this->_activityIds;
     foreach ($activityIds as $activityId) {
       // set params for repeat configuration in create mode