summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org/anjocaido/groupmanager
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2011-12-18 14:26:00 +0000
committerElgarL <ElgarL@palmergames.com>2011-12-18 14:26:00 +0000
commit51213677078e4684a4333975f41ad6f965e4cd64 (patch)
treec38e94164b44f8a3053419ea0988d363e361e9e7 /EssentialsGroupManager/src/org/anjocaido/groupmanager
parent9a1a6c14918ab51e6e38c224f50886d723509912 (diff)
downloadEssentials-51213677078e4684a4333975f41ad6f965e4cd64.tar
Essentials-51213677078e4684a4333975f41ad6f965e4cd64.tar.gz
Essentials-51213677078e4684a4333975f41ad6f965e4cd64.tar.lz
Essentials-51213677078e4684a4333975f41ad6f965e4cd64.tar.xz
Essentials-51213677078e4684a4333975f41ad6f965e4cd64.zip
Fixed 'manucheckp' returning a null for the searched node when it's a
group/subgroup.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager')
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
index 6e18bf3f8..9b7253c41 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
@@ -711,12 +711,14 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
PermissionCheckResult resultUser = checkUserOnlyPermission(user, targetPermission);
if (resultUser.resultType != PermissionCheckResult.Type.NOTFOUND) {
+ resultUser.accessLevel = targetPermission;
return resultUser;
}
// IT ONLY CHECKS GROUPS PERMISSIONS IF RESULT FOR USER IS NOT FOUND
PermissionCheckResult resultGroup = checkGroupPermissionWithInheritance(user.getGroup(), targetPermission);
if (resultGroup.resultType != PermissionCheckResult.Type.NOTFOUND) {
+ result.accessLevel = targetPermission;
return resultGroup;
}
@@ -724,6 +726,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
for (Group subGroup : user.subGroupListCopy()) {
PermissionCheckResult resultSubGroup = checkGroupPermissionWithInheritance(subGroup, targetPermission);
if (resultSubGroup.resultType != PermissionCheckResult.Type.NOTFOUND) {
+ resultSubGroup.accessLevel = targetPermission;
return resultSubGroup;
}
}