diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java')
-rw-r--r-- | plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java index 26d48129c5d..416ec1bfc7d 100644 --- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java +++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java @@ -439,10 +439,11 @@ public class AccessControlService implements IAccessControlService { } } } + // user does not have entry in the branch access control table for this branch if (userPermission == null) { - if (!CoreBranches.COMMON.equals(accessObject.getBranch()) && BranchManager.getType( - accessObject.getBranch()).isBaselineBranch()) { - userPermission = PermissionEnum.READ; + // If there are any other access on this branch, it's locked for this user + if (objectToSubjectCache.containsKey(accessObject)) { + userPermission = PermissionEnum.DENY; } else { userPermission = PermissionEnum.FULLACCESS; } |