From e65023fb31f27f59415e97b4fd29539556af78ef Mon Sep 17 00:00:00 2001 From: Bogdanova Olga Date: Sat, 22 Jan 2022 12:02:54 +0300 Subject: [PATCH 1/2] Issues-662: Email message tweak for MFE --- .../dashboard/models/class.activitymodel.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/vanilla/applications/dashboard/models/class.activitymodel.php b/vanilla/applications/dashboard/models/class.activitymodel.php index 4bafd8d..0d202ab 100644 --- a/vanilla/applications/dashboard/models/class.activitymodel.php +++ b/vanilla/applications/dashboard/models/class.activitymodel.php @@ -1054,7 +1054,15 @@ public function email(&$activity, $options = []) { $email->subject($subject); $email->to($user); - $url = externalUrl(val('Route', $activity) == '' ? '/' : val('Route', $activity)); + logMessage(__FILE__, __LINE__, 'ActivityModels', '!!!!!!!!!!', "".$activity['Data']['EmailUrl']); + + // FIX https://github.com/topcoder-platform/forums/issues/662 + if($activity['Data']['EmailUrl']) { + $url = $activity['Data']['EmailUrl']; + } else { + $url = externalUrl(val('Route', $activity) == '' ? '/' : val('Route', $activity)); + } + $emailTemplate = $email->getEmailTemplate() ->setButton($url, val('ActionText', $activity, t('Check it out'))) @@ -1067,7 +1075,7 @@ public function email(&$activity, $options = []) { $email->setEmailTemplate($emailTemplate); // Fire an event for the notification. - $notification = ['ActivityID' => $activityID, 'User' => $user, 'Email' => $email, 'Route' => $activity['Route'], 'Story' => $activity['Story'], 'Headline' => $activity['Headline'], 'Activity' => $activity]; + $notification = ['ActivityID' => $activityID, 'User' => $user, 'Email' => $email, 'EmailUrl'=>$url, 'Route' => $activity['Route'], 'Story' => $activity['Story'], 'Headline' => $activity['Headline'], 'Activity' => $activity]; $this->EventArguments = $notification; $this->fireEvent('BeforeSendNotification'); From 7634da20ec30d70883a15db43867230470ad598e Mon Sep 17 00:00:00 2001 From: Bogdanova Olga Date: Sat, 22 Jan 2022 12:14:45 +0300 Subject: [PATCH 2/2] Issues-662: Email message tweak for MFE --- vanilla/applications/dashboard/models/class.activitymodel.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/vanilla/applications/dashboard/models/class.activitymodel.php b/vanilla/applications/dashboard/models/class.activitymodel.php index 0d202ab..30e1262 100644 --- a/vanilla/applications/dashboard/models/class.activitymodel.php +++ b/vanilla/applications/dashboard/models/class.activitymodel.php @@ -1054,8 +1054,6 @@ public function email(&$activity, $options = []) { $email->subject($subject); $email->to($user); - logMessage(__FILE__, __LINE__, 'ActivityModels', '!!!!!!!!!!', "".$activity['Data']['EmailUrl']); - // FIX https://github.com/topcoder-platform/forums/issues/662 if($activity['Data']['EmailUrl']) { $url = $activity['Data']['EmailUrl'];