hotfix: merge <<< HEAD ---- >>> SHA1 messages stood on the code somehow
This commit is contained in:
@@ -29,10 +29,8 @@ public class CoreAuthGuard extends AbstractAuthGuard<UserEntity, CoreUserRole> {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean hasPermission(UserEntity member, CoreUserRole userRole, CoreUserRole... allowedRoles) {
|
||||
if (member == null) return false;
|
||||
if (member.getGlobal_role() == CoreUserRole.ADMIN) return true;
|
||||
return false;
|
||||
protected boolean hasPermission(UserEntity user, CoreUserRole userRole) {
|
||||
return user.getGlobal_role() == CoreUserRole.ADMIN;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user