Skip to content
Snippets Groups Projects
Commit 706807f3 authored by srosse's avatar srosse
Browse files

Merge OpenOLAT 10.2 to OpenOLAT default branch with 1026c1100a868e9573b9d4670cd86a2dbd0b994c

parents 0781a23d 065db8c6
No related branches found
No related tags found
No related merge requests found
......@@ -77,7 +77,9 @@ public class Rule {
}
public boolean match(UserSession userSession) {
if(userSession == null || userSession.getRoles() == null) return false;
if(userSession == null || userSession.getRoles() == null || userSession.getIdentity() == null) {
return false;
}
boolean match = true;
......@@ -88,7 +90,7 @@ public class Rule {
case AUTHOR: match &= roles.isAuthor(); break;
case USER_MGR: match &= roles.isUserManager(); break;
case GROUP_MGR: match &= roles.isGroupManager(); break;
case RSRC_MGR: match &= roles.isInstitutionalResourceManager(); break;
case RSRC_MGR: match &= roles.isInstitutionalResourceManager(); break;
case POOL_MGR: match &= roles.isPoolAdmin(); break;
case ADMIN: match &= roles.isOLATAdmin(); break;
default: {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment