tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 21:29:23 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4907 from d-rivera-c/pulls/group-roles-admin-check

Browse Source 
Display all roles when an admin, filter by OnlyAdminCanApply when not
This commit is contained in:
Damian Mooyman 2016-01-12 10:50:07 +13:00
commit 1d13660530
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/Group.php
View File

@ -183,7 +183,7 @@ class Group extends DataObject {
// Add roles (and disable all checkboxes for inherited roles)
$allRoles = PermissionRole::get();
if(Permission::check('ADMIN')) {
if(!Permission::check('ADMIN')) {
$allRoles = $allRoles->filter("OnlyAdminCanApply", 0);
}
if($this->ID) {