Merge pull request #71 from topcoder-platform/issues-476

Issues-476: Fixed challenge roles for user photo links

Author: jmgasper

class.groups.plugin.php

@@ -753,7 +753,10 @@ public function base_userAnchor_handler($sender, $args){
             $anchorText = '<span class="topcoderHandle">'.$anchorText.'</span>';
             // Don't show Topcoder Challenge roles for admin roles
             if(!$isTopcoderAdmin){
-                $anchorText = $anchorText . $this->topcoderProjectRolesText($user, $resources, $roleResources);
+                $roles =  $this->topcoderProjectRolesText($user, $resources, $roleResources);
+                if($roles) {
+                    $anchorText = $anchorText . '&nbsp;<span class="challengeRoles">('.$roles. ')</span>';
+                }
             }
         }
     }
@@ -764,19 +767,27 @@ public function base_userAnchor_handler($sender, $args){
      * @param $args
      */
     public function base_userPhoto_handler($sender, $args){
-        if($sender instanceof DiscussionController || $sender instanceof GroupController) {
+        if($sender instanceof DiscussionController || $sender instanceof GroupController || $sender instanceof PostController) {
             $user = $args['User'];
             $anchorText = &$args['Title'];
+            $isTopcoderAdmin = $args['IsTopcoderAdmin'];
             $resources = $sender->data('ChallengeResources');
             $roleResources = $sender->data('ChallengeRoleResources');
+            // Don't show Topcoder Challenge roles for admin roles
+            if(!$isTopcoderAdmin){
+                $roles =  $this->topcoderProjectRolesText($user, $resources, $roleResources);
+                if($roles) {
+                    $anchorText = $anchorText.'&nbsp;('.$roles. ')';
+                }
+            }
         }
     }
 
     private function topcoderProjectRolesText($user, $resources = null, $roleResources = null) {
        $roles = $this->getTopcoderProjectRoles($user, $resources, $roleResources);
        // FIX: https://github.com/topcoder-platform/forums/issues/476:  Show only Copilot, Reviewer roles
        $displayedRoles =  array_intersect(array_unique($roles), ["Copilot", "Reviewer"]);
-       return count($displayedRoles) > 0 ? ' <span class="challengeRoles">(' . implode(', ', $displayedRoles) . ')</span>' : '';
+       return count($displayedRoles) > 0 ? implode(', ', $displayedRoles) : '';
     }
 
     /**