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

Merge pull request #7342 from open-sausages/pulls/4.0/disable-me-a-plus

Browse Source 
Fix permission check for admin role
This commit is contained in:
Damian Mooyman 2017-09-06 11:38:01 +12:00 committed by GitHub
commit 40678d5897
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Security/PermissionCheckboxSetField.php
View File

@ -238,27 +238,29 @@ class PermissionCheckboxSetField extends FormField
}
$inheritMessage = '<small>' . $inheritMessage . '</small>';
$icon = ($checked) ? 'check-mark-circle' : 'cancel-circled';
// Inherited codes are shown as a gray x
if (Permission::check('ADMIN') && $code != 'ADMIN') {
$icon = 'disable-circled';
}
// If the field is readonly, add a span that will replace the disabled checkbox input
if ($this->readonly) {
$icon = ($checked) ? 'check-mark-circle' : 'cancel-circled';
$record = $this->form->getRecord();
// Inherited codes are shown as a gray x
if ($record && $record instanceof Member &&
Permission::checkMember($record, 'ADMIN') && $code != 'ADMIN') {
$icon = 'plus-circled';
}
$options .= "<li class=\"$extraClass\">"
. "<input id=\"$itemID\"$disabled name=\"$this->name[$code]\" type=\"checkbox\""
. " value=\"$code\"$checked class=\"checkbox\" />"
. "<label {$title}for=\"$itemID\">"
. "<span class=\"font-icon-$icon\"></span>"
. "$value$inheritMessage</label>"
. "{$value}{$inheritMessage}</label>"
. "</li>\n";
} else {
$options .= "<li class=\"$extraClass\">"
. "<input id=\"$itemID\"$disabled name=\"$this->name[$code]\" type=\"checkbox\""
. " value=\"$code\"$checked class=\"checkbox\" />"
. "<label {$title}for=\"$itemID\">$value$inheritMessage</label>"
. "<label {$title}for=\"$itemID\">{$value}{$inheritMessage}</label>"
. "</li>\n";
}
}