diff options
| author | Christian Hofmaier | 2017-04-07 16:06:04 +0200 |
|---|---|---|
| committer | Christian Hofmaier | 2017-04-07 16:06:04 +0200 |
| commit | f84880d1ea389854d7b1a5c948af9433bbeb2ded (patch) | |
| tree | 58ecd459c235e2f88af5229e99ca6c025367db61 /modules-available/permissionmanager | |
| parent | [permission-manager] corrected wrong indentation for much better readability (diff) | |
| parent | [permission-manager] removed unused code (diff) | |
| download | slx-admin-f84880d1ea389854d7b1a5c948af9433bbeb2ded.tar.gz slx-admin-f84880d1ea389854d7b1a5c948af9433bbeb2ded.tar.xz slx-admin-f84880d1ea389854d7b1a5c948af9433bbeb2ded.zip | |
Merge branch 'permission-manager' of git.openslx.org:openslx-ng/slx-admin into permission-manager
Diffstat (limited to 'modules-available/permissionmanager')
| -rw-r--r-- | modules-available/permissionmanager/page.inc.php | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/modules-available/permissionmanager/page.inc.php b/modules-available/permissionmanager/page.inc.php index 94a5469f..30cc07c3 100644 --- a/modules-available/permissionmanager/page.inc.php +++ b/modules-available/permissionmanager/page.inc.php @@ -92,29 +92,13 @@ class Page_PermissionManager extends Page } $permissions = PermissionUtil::getPermissions(); - $permissionHTML = ""; - foreach ($permissions as $k => $v) { - $name = Module::get($k)->getDisplayName(); - $permissionHTML .= " - <div id='$k' class='panel panel-primary module-box' style='display: none;'> - <div class='panel-heading'> - <div class='checkbox'> - <input name='permissions[]' value='$k.*' type='checkbox' class='form-control'> - <label>$name</label> - </div> - </div> - <div class='panel-body'> - "; - $permissionHTML .= self::generatePermissionHTML($v, $k); - $permissionHTML .= "</div></div>"; - } $data["locations"] = GetPermissionData::getLocations($selectedLocations); $data["moduleNames"] = array(); foreach (array_keys($permissions) as $moduleid) { $data["moduleNames"][] = array("id" => $moduleid, "name" => Module::get($moduleid)->getDisplayName()); } - $data["permissionHTML"] = $permissionHTML; + $data["permissionHTML"] = self::generatePermissionHTML($permissions, "*"); Render::addTemplate('roleeditor', $data); } @@ -148,7 +132,7 @@ class Page_PermissionManager extends Page $genModuleBox = $permString == "*"; $res = ""; foreach ($subPermissions as $k => $v) { - $res .= Render::parse($genModuleBox ? "modulepermissionbox" : is_array($v) ? "permissiontreenode" : "permission", + $res .= Render::parse($genModuleBox ? "modulepermissionbox" : (is_array($v) ? "permissiontreenode" : "permission"), array("id" => $genModuleBox ? $k : $permString.".".$k, "name" => $genModuleBox ? Module::get($k)->getDisplayName(): $k, "HTML" => self::generatePermissionHTML($v, $genModuleBox ? $k : $permString.".".$k), |