Skip to content

fixes chaloner/deadbolt#12 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tazmaniax wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixes chaloner/deadbolt#12 #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions app/controllers/deadbolt/Deadbolt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,26 @@ private static RoleHolder getRoleHolder()
@Before
static void checkRestrictions() throws Throwable
{
DEADBOLT_HANDLER.beforeRoleCheck();

RoleHolder roleHolder = getRoleHolder();
RestrictionType restrictionType = getRestrictionType();
if (restrictionType == RestrictionType.DYNAMIC)
{
handleDynamicChecks(roleHolder);
}
else if (restrictionType == RestrictionType.STATIC)
{
handleStaticChecks(roleHolder);
}
else if (restrictionType == RestrictionType.BASIC)

if (restrictionType != null && restrictionType != RestrictionType.NONE)
{
handleRoleHolderPresent(roleHolder);
DEADBOLT_HANDLER.beforeRoleCheck();

RoleHolder roleHolder = getRoleHolder();

if (restrictionType == RestrictionType.DYNAMIC)
{
handleDynamicChecks(roleHolder);
}
else if (restrictionType == RestrictionType.STATIC)
{
handleStaticChecks(roleHolder);
}
else if (restrictionType == RestrictionType.BASIC)
{
handleRoleHolderPresent(roleHolder);
}
}
}

Expand Down