Merge pull request #106 from topcoder-platform/develop

v1.9 - Self service app

Author: jmgasper

class.groups.plugin.php

@@ -211,6 +211,7 @@ public function base_render_before($sender) {
 
     public function base_groupOptionsDropdown_handler($sender, $args){
         $group = $args['Group'];
+        $options = &$args['GroupOptionsDropdown'];
         // $currentTopcoderProjectRoles = $sender->Data['ChallengeCurrentUserProjectRoles'];
         $groupModel = new GroupModel();
         // $groupModel->setCurrentUserTopcoderProjectRoles($currentTopcoderProjectRoles);
@@ -226,6 +227,9 @@ public function base_groupOptionsDropdown_handler($sender, $args){
         $hasFollowed = $groupModel->hasFollowedGroup($group);
         $hasWatched = $groupModel->hasWatchedGroup($group);
 
+        if(hideInMFE()) {
+            $options->setItems([]);
+        }
        // self::log('base_groupOptionsDropdown_handler', ['Group' => $group->GroupID,
        //     'currentUserTopcoderProjectRoles' =>$currentTopcoderProjectRoles,
        //     'canDelete' => $canDelete, 'canEdit' => $canEdit, 'canLeave' => $canLeave,
@@ -328,6 +332,9 @@ public function base_discussionOptionsDropdown_handler($sender, $args){
                 $options->removeItem('refetch');
             }
 
+            if(hideInMFE()) {
+                $options->setItems([]);
+            }
             self::log('discussionController_discussionOptionsDropdown_handler', ['Discussion' => $Discussion->DiscussionID,
                 'canDelete' => $canDelete, 'canEdit' => $canEdit, 'canDismiss' => $canDismiss,
                 'canAnnounce' =>$canAnnounce, 'canSink' => $canSink, 'canMove' => $canMove, 'canReFetch' => $canRefetch ]);
@@ -380,9 +387,9 @@ public function discussionController_discussionInfo_handler($sender, $args) {
             if($groupID) {
                 $group = $groupModel->getByGroupID($groupID);
                 if($group->ChallengeUrl) {
-                    echo anchor($group->Name, $group->ChallengeUrl);
+                    echo anchor($group->Name, hideInMFE() ? '' : $group->ChallengeUrl);
                 } else {
-                    echo anchor($group->Name, GroupsPlugin::GROUP_ROUTE.$groupID);
+                    echo anchor($group->Name, hideInMFE() ? '' : GroupsPlugin::GROUP_ROUTE.$groupID);
                 }
             }
         }
@@ -422,12 +429,15 @@ public function watchingController_afterChallenge_handler($sender, $args) {
     }
 
     private function writeAfterChallenge($sender, $args) {
+        if(hideInMFE()) {
+            return;
+        }
         $category = $args['Category'];
         $groupID = val('GroupID', $category);
         if($groupID) {
             $group = $this->groupModel->getByGroupID($groupID);
             $type = ucfirst(GroupsPlugin::UI[$group->Type]['TypeName']);
-            echo '<span>'.$type.':</span>&nbsp;'.anchor( $group->Name, self::GROUP_ROUTE.$group->GroupID);
+            echo '<div class="Challenge"><span>'.$type.':</span>&nbsp;'.anchor( $group->Name, self::GROUP_ROUTE.$group->GroupID).'</div>';
         }
     }
 
@@ -647,7 +657,10 @@ public function categoryModel_getCategoryNotificationPreferences_create(Category
     //
     // EMAIL TEMPLATES
     //
-
+    private function buildEmbedEmailUrl($challengeID) {
+        $mfeUrl = c("Garden.Embed.RemoteUrl");
+        return $mfeUrl.'/self-service/work-items/'.$challengeID.'/?tab=messaging';
+    }
     /**
      *  New discussion has been posted
      * @param $sender
@@ -670,6 +683,9 @@ public function discussionModel_beforeRecordAdvancedNotification_handler($sender
                 $group =  $groupModel->getByGroupID($category['GroupID']);
                 $groupName = $group->Name;
                 $groupLink = $this->buildEmailGroupLink($group);
+                $data['Data']['GroupID'] = val('GroupID', $group);
+                $data['Data']['ChallengeID'] = val('ChallengeID', $group);
+                $data['Data']['EmbedUrl'] = $this->buildEmbedEmailUrl(val('ChallengeID', $group));
             }
             $categoryBreadcrumbs = array_column(array_values(CategoryModel::getAncestors($discussion['CategoryID'])), 'Name');
             $dateInserted = Gdn_Format::dateFull($discussion['DateInserted']);
@@ -724,6 +740,9 @@ public function commentModel_beforeRecordAdvancedNotification($sender, $args){
                 $group =  $groupModel->getByGroupID($category['GroupID']);
                 $groupName = $group->Name;
                 $groupLink = $this->buildEmailGroupLink($group);
+                $data['Data']['GroupID'] = val('GroupID', $group);
+                $data['Data']['ChallengeID'] = val('ChallengeID', $group);
+                $data['Data']['EmbedUrl'] = $this->buildEmbedEmailUrl(val('ChallengeID', $group));
             }
             $categoryBreadcrumbs = array_column(array_values(CategoryModel::getAncestors($discussion['CategoryID'])), 'Name');
             $discussionDateInserted = Gdn_Format::dateFull($discussion['DateInserted']);