tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-09-25 18:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Roles: Include permissions and restrictions of unloaded modules too

Browse Source 
Because we now have module permissions it makes sense to allow an admin to configure permissions and restrictions from a module
before allowing access to it.

refs #9644
This commit is contained in:
Eric Lippmann 2015-07-24 16:13:08 +02:00
parent 8358e9165c
commit a51f0ad65e
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/forms/Security/RoleForm.php
View File

@ -71,8 +71,8 @@ class RoleForm extends ConfigForm
$moduleName, $moduleName,
$modulePermission $modulePermission
); );
if ($mm->hasEnabled($moduleName)) {
$module = $mm->getModule($moduleName); $module = $mm->getModule($moduleName, false);
foreach ($module->getProvidedPermissions() as $permission) { foreach ($module->getProvidedPermissions() as $permission) {
/** @var object $permission */ /** @var object $permission */
$this->providedPermissions[$permission->name] = $permission->description $this->providedPermissions[$permission->name] = $permission->description
@ -95,7 +95,6 @@ class RoleForm extends ConfigForm
} }
} }
} }
}
/** /**
* {@inheritdoc} * {@inheritdoc}