jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

User roles and permission management via Admin UI (#1231)

Browse Source
This commit is contained in:
Kevin Papst
2019-11-10 18:53:56 +01:00
committed by GitHub
parent c6c4098759
commit af0f89774e
58 changed files with 1355 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Voter/RolePermissionVoter.php
View File

@@ -30,13 +30,7 @@ class RolePermissionVoter extends AbstractVoter
return false;
}
// and which is not neither a user role like USER_ADMIN
// nor an implicit role like IS_REMEMBERED / IS_FULLY_AUTHENTICATED
if (strpos($attribute, 'ROLE_') === false && strpos($attribute, 'IS_') === false) {
return $this->isRegisteredPermission($attribute);
}
return false;
return $this->isRegisteredPermission($attribute);
}
/**
@@ -53,12 +47,6 @@ class RolePermissionVoter extends AbstractVoter
return false;
}
foreach ($user->getRoles() as $role) {
if ($this->hasPermission($role, $attribute)) {
return true;
}
}
return false;
return $this->hasRolePermission($user, $attribute);
}
}