Merge pull request #249 from topcoder-platform/issues-217

Issues-217: check member group permissions

Author: jmgasper

config/vanilla/bootstrap.before.php

@@ -362,13 +362,15 @@ function watchButton($categoryID) {
     /**
      * Check group permission for the current user
      * @param $groupID
-     * @param null $permission  null - any permission for a group
+     * @param null $category
+     * @param null $permissionCategoryID
+     * @param null $permission null - any permission for a group
      * @param bool $fullMatch
      * @return bool return true if user has a permission
      */
-   function checkGroupPermission($groupID,$permission = null, $fullMatch = true) {
+   function checkGroupPermission($groupID, $category = null , $permissionCategoryID = null , $permission = null, $fullMatch = true) {
        $groupModel = new GroupModel();
-       return $groupModel->checkPermission(Gdn::session()->UserID,$groupID, $permission, $fullMatch);
+       return $groupModel->checkPermission(Gdn::session()->UserID,$groupID, $category,$permissionCategoryID , $permission, $fullMatch);
    }
 }
 

vanilla/applications/dashboard/models/class.usermodel.php

@@ -1094,13 +1094,15 @@ public function joinUsers(&$data, $columns, $options = []) {
                     $user = $users[$iD] ?? false;
                     foreach ($join as $column) {
                         $value = $user[$column];
+                        // This code executes about 0,5 sec per a row
+                        /*
                         if ($column == 'Photo') {
                             if ($value && !isUrl($value)) {
                                 $value = Gdn_Upload::url(changeBasename($value, 'n%s'));
                             } elseif (!$value) {
                                 $value = UserModel::getDefaultAvatarUrl($user);
                             }
-                        }
+                        }*/
                         setValue($px.$column, $row, $value);
                     }
                 } else {

vanilla/applications/vanilla/models/class.categorymodel.php

@@ -905,7 +905,7 @@ public static function checkPermission($category, $permission, $fullMatch = true
         }
 
         if($groupID && $groupID > 0) {
-           $result = checkGroupPermission($groupID);
+           $result = checkGroupPermission($groupID, $category, $permissionCategoryID,  $permission, $fullMatch);
         } else {
            $result = Gdn::session()->checkPermission($permission, $fullMatch, 'Category', $permissionCategoryID)
                     || Gdn::session()->checkPermission($permission, $fullMatch, 'Category', $categoryID);