Skip to content

Commit 1c0a706

Browse files
committed
Issues-384: re-enabled moving discussions
1 parent 7751d9c commit 1c0a706

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

models/class.groupmodel.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,11 +1728,22 @@ public function canCloseDiscussion($discussion) {
17281728
}
17291729

17301730
/**
1731-
* Check move group discusion permission
1731+
* Check move group discussion permission
17321732
*
17331733
*/
17341734
public function canMoveDiscussion($discussion) {
1735-
// Don't move any discussions
1735+
if ($this->canEditDiscussion($discussion) && Gdn::session()->checkPermission('Garden.Moderation.Manage')) {
1736+
return true;
1737+
}
1738+
1739+
$groupID = $this->findGroupIDFromDiscussion($discussion);
1740+
$group = $this->getByGroupID($groupID);
1741+
$result = $this->getGroupRoleFor(Gdn::session()->UserID, $groupID);
1742+
$groupRole = val('Role', $result, null);
1743+
if($groupRole === GroupModel::ROLE_LEADER || Gdn::session()->UserID === $group->OwnerID
1744+
|| Gdn::session()->checkPermission(GroupsPlugin::GROUPS_MODERATION_MANAGE_PERMISSION)) {
1745+
return true;
1746+
}
17361747
return false;
17371748
}
17381749

0 commit comments

Comments
 (0)