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

Issues-490: Fixed  permissions

Author: jmgasper

models/class.groupmodel.php

@@ -1541,11 +1541,6 @@ public function canAddNewAnnouncement($group) {
      */
     public function canEditDiscussion($discussion) {
         $canEditDiscussion = DiscussionModel::canEdit($discussion) ;
-        $groupID= $this->findGroupIDFromDiscussion($discussion);
-        if($groupID && Gdn::session()->checkPermission(GroupsPlugin::GROUPS_MODERATION_MANAGE_PERMISSION)) {
-            return true;
-        }
-
         return $canEditDiscussion;
     }
 
@@ -1554,21 +1549,12 @@ public function canEditDiscussion($discussion) {
      *
      */
     public function canDismissDiscussion($discussion) {
-        $canDismissDiscussion =  CategoryModel::checkPermission($discussion->CategoryID, 'Vanilla.Discussions.Dismiss', true)
+        $canDismissDiscussion =  c('Vanilla.Discussions.Dismiss', 1)
         && $discussion->Announce
         && !$discussion->Dismissed
         && Gdn::session()->isValid();
-
-        $groupID = $this->findGroupIDFromDiscussion($discussion);
-        if($groupID) {
-            $group = $this->getByGroupID($groupID);
-            $groupRole = self::getGroupRoleFor(Gdn::session()->UserID, $groupID);
-            if ($groupRole === GroupModel::ROLE_LEADER || Gdn::session()->UserID === $group->OwnerID ||
-                Gdn::session()->checkPermission(GroupsPlugin::GROUPS_MODERATION_MANAGE_PERMISSION)) {
-                return true;
-            }
-        }
         return $canDismissDiscussion;
+
     }
 
     /**
@@ -1638,16 +1624,6 @@ public function canMoveDiscussion($discussion) {
             Gdn::session()->checkPermission('Garden.Moderation.Manage')) {
             return true;
         }
-
-        $groupID = $this->findGroupIDFromDiscussion($discussion);
-        if($groupID) {
-            $group = $this->getByGroupID($groupID);
-            $groupRole = self::getGroupRoleFor(Gdn::session()->UserID, $groupID);
-            if ($groupRole === GroupModel::ROLE_LEADER || Gdn::session()->UserID === $group->OwnerID
-                || Gdn::session()->checkPermission(GroupsPlugin::GROUPS_MODERATION_MANAGE_PERMISSION)) {
-                return true;
-            }
-        }
         return false;
     }
 
@@ -1662,14 +1638,6 @@ public function canRefetchDiscussion($discussion) {
      */
     public function canDeleteDiscussion($discussion) {
         $canDeleteDiscussion = CategoryModel::checkPermission($discussion->CategoryID, 'Vanilla.Discussions.Delete');
-        /*
-        $groupID = $this->findGroupIDFromDiscussion($discussion);
-        if($groupID) {
-            $group = $this->getByGroupID($groupID);
-            if (Gdn::session()->UserID == $group->OwnerID) {
-                return true;
-            }
-        }*/
         return $canDeleteDiscussion ;
     }