Fixed issues-205

Author: atelomycterus

class.groups.plugin.php

@@ -171,11 +171,15 @@ public function onDisable() {
     public function discussionsController_beforeDiscussionMetaData_handler($sender, $args){
         if($args['Discussion']) {
             $discussion = $args['Discussion'];
-            if ($discussion->GroupID) {
-                $result = '/group/' . $discussion->GroupID;
+            $groupModel = new GroupModel();
+            $groupID = $groupModel->findGroupIDFromDiscussion($discussion);
+            GroupsPlugin::log('discussionsController_beforeDiscussionMetaData_handler', [
+                'GroupID' => $groupID]);
+            if ($groupID) {
+                $result = '/group/' . $groupID;
                 $url = url($result, true);
-                $groupModel = new GroupModel();
-                $group = $groupModel->getByGroupID($discussion->GroupID);
+
+                $group = $groupModel->getByGroupID($groupID);
                 echo '<div class="Meta Meta-Discussion Group-Info">'.
                         '<span class="MItem ">'.
                             '<span class="label">Challenge: </span>'.
@@ -240,11 +244,13 @@ public function settingsController_groups_create($sender) {
 
     public function discussionController_render_before($sender, $args) {
         $Discussion = $sender->data('Discussion');
-        if($Discussion && $Discussion->GroupID != null) {
+        if($Discussion) {
             $groupModel = new GroupModel();
             $currentTopcoderProjectRoles = $sender->Data['ChallengeCurrentUserProjectRoles'];
             $groupModel->setCurrentUserTopcoderProjectRoles($currentTopcoderProjectRoles);
-            $Group = $groupModel->getByGroupID($Discussion->GroupID);
+            $groupID = $groupModel->findGroupIDFromDiscussion($Discussion);
+            self::log('discussionController_render_before:GroupID='.$groupID, []);
+            $Group = $groupModel->getByGroupID($groupID);
             if (!$groupModel->canView($Group)) {
                 throw permissionException();
             }
@@ -324,15 +330,6 @@ public function base_discussionOptionsDropdown_handler($sender, $args){
         }
     }
 
-    /*
-    public function discussionsController_afterDiscussionFilters_handler($sender){
-        $this->addGroupLinkToMenu();
-    }
-
-    public function discussionController_afterDiscussionFilters_handler($sender){
-        $this->addGroupLinkToMenu();
-    }
-    */
     public function base_afterDiscussionFilters_handler($sender){
         $this->addGroupLinkToMenu($sender);
     }
@@ -362,9 +359,9 @@ public function base_categoryOptionsDropdown_handler($sender, $args) {
      */
     public function discussionController_discussionInfo_handler($sender, $args) {
         if($sender->Data['Discussion']) {
-            $groupID = $sender->Data['Discussion']->GroupID;
+            $groupModel = new GroupModel();
+            $groupID = $groupModel->findGroupIDFromDiscussion($sender->Data['Discussion']);
             if($groupID) {
-                $groupModel = new GroupModel();
                 $group = $groupModel->getByGroupID($groupID);
                 if($group->ChallengeUrl) {
                     echo anchor($group->Name, $group->ChallengeUrl);
@@ -381,10 +378,12 @@ public function postController_afterDiscussionSave_handler($sender, $args) {
             return;
         }
         $discussion= $args['Discussion'];
+        $groupModel = new GroupModel();
+        $groupID = $groupModel->findGroupIDFromDiscussion($discussion);
         if ($sender->deliveryType() == DELIVERY_TYPE_ALL) {
-            redirectTo(GroupsPlugin::GROUP_ROUTE.$discussion->GroupID);
+            redirectTo(GroupsPlugin::GROUP_ROUTE.$groupID);
         } else {
-            $sender->setRedirectTo(GroupsPlugin::GROUP_ROUTE.$discussion->GroupID);
+            $sender->setRedirectTo(GroupsPlugin::GROUP_ROUTE.$groupID);
         }
     }
 

models/class.groupmodel.php

@@ -510,6 +510,15 @@ public function getDefaultLimit() {
         return c('Vanilla.Groups.PerPage', 30);
     }
 
+    public function findGroupIDFromDiscussion($discussion){
+        if(is_numeric($discussion)){
+            $discussionModel = new DiscussionModel();
+            $discussion = $discussionModel->getID($discussion);
+        }
+        $categoryID = val('CategoryID', $discussion);
+        $category = CategoryModel::categories($categoryID);
+        return val('GroupID', $category, false);
+    }
 
     /**
      * Default Gdn_Model::get() behavior.
@@ -1438,7 +1447,7 @@ public function canAddAnnouncement($group) {
      *
      */
     public function canViewDiscussion($discussion) {
-        $groupID= $discussion->GroupID;
+        $groupID = $this->findGroupIDFromDiscussion($discussion);
         if(!$groupID) {
             return true;
         }
@@ -1456,7 +1465,7 @@ public function canViewDiscussion($discussion) {
      */
     public function canEditDiscussion($discussion) {
         $canEditDiscussion = DiscussionModel::canEdit($discussion) ;
-        $groupID= $discussion->GroupID;
+        $groupID= $this->findGroupIDFromDiscussion($discussion);
         if(!$groupID) {
             return $canEditDiscussion;
         }
@@ -1480,7 +1489,7 @@ public function canDismissDiscussion($discussion) {
         && !$discussion->Dismissed
         && Gdn::session()->isValid();
 
-        $groupID= $discussion->GroupID;
+        $groupID= $this->findGroupIDFromDiscussion($discussion);
         if(!$groupID ) {
             return $canDismissDiscussion;
         }
@@ -1506,7 +1515,8 @@ public function canDismissDiscussion($discussion) {
      */
     public function canAnnounceDiscussion($discussion) {
         $canAnnounceDiscussion =  CategoryModel::checkPermission($discussion->CategoryID, 'Vanilla.Discussions.Announce', true);
-        $groupID = $discussion->GroupID;
+        $groupID = $this->findGroupIDFromDiscussion($discussion);
+
         if(!$groupID ) {
             return $canAnnounceDiscussion;
         }
@@ -1557,7 +1567,7 @@ public function canAddComment($categoryID, $groupID) {
      */
     public function canSinkDiscussion($discussion) {
         $canSinkDiscussion =  CategoryModel::checkPermission($discussion->CategoryID, 'Vanilla.Discussions.Sink', true);
-        $groupID = $discussion->GroupID;
+        $groupID = $this->findGroupIDFromDiscussion($discussion);
         if(!$groupID ) {
             return $canSinkDiscussion;
         }
@@ -1584,7 +1594,7 @@ public function canSinkDiscussion($discussion) {
      */
     public function canCloseDiscussion($discussion) {
         $canCloseDiscussion =  CategoryModel::checkPermission($discussion->CategoryID, 'Vanilla.Discussions.Close', true);
-        $groupID = $discussion->GroupID;
+        $groupID = $this->findGroupIDFromDiscussion($discussion);
         if(!$groupID ) {
             return $canCloseDiscussion;
         }
@@ -1621,7 +1631,7 @@ public function canRefetchDiscussion($discussion) {
 
     public function canDeleteDiscussion($discussion) {
         $canDeleteDiscussion =  CategoryModel::checkPermission($discussion->CategoryID, 'Vanilla.Discussions.Delete', true);
-        $groupID= $discussion->GroupID;
+        $groupID = $this->findGroupIDFromDiscussion($discussion);
         if(!$groupID) {
              return $canDeleteDiscussion;
         }