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

Rename permission config/application/groups* to config/authentication/...

Browse Source 
refs #8826
This commit is contained in:
Johannes Meyer 2015-06-02 09:04:34 +02:00
parent a558f2873a
commit 3fffd90135
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/controllers/GroupController.php
View File

@ -30,7 +30,7 @@ class GroupController extends AuthBackendController
*/ */
public function listAction() public function listAction()
{ {
$this->assertPermission('config/application/groups/show'); $this->assertPermission('config/authentication/groups/show');
$backendNames = array_map( $backendNames = array_map(
function ($b) { return $b->getName(); }, function ($b) { return $b->getName(); },
$this->loadUserGroupBackends('Icinga\Data\Selectable') $this->loadUserGroupBackends('Icinga\Data\Selectable')
@ -87,7 +87,7 @@ class GroupController extends AuthBackendController
*/ */
public function showAction() public function showAction()
{ {
$this->assertPermission('config/application/groups/show'); $this->assertPermission('config/authentication/groups/show');
$groupName = $this->params->getRequired('group'); $groupName = $this->params->getRequired('group');
$backend = $this->getUserGroupBackend($this->params->getRequired('backend')); $backend = $this->getUserGroupBackend($this->params->getRequired('backend'));
@ -164,7 +164,7 @@ class GroupController extends AuthBackendController
*/ */
public function addAction() public function addAction()
{ {
$this->assertPermission('config/application/groups/add'); $this->assertPermission('config/authentication/groups/add');
$backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible'); $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible');
$form = new UserGroupForm(); $form = new UserGroupForm();
$form->setRedirectUrl(Url::fromPath('group/list', array('backend' => $backend->getName()))); $form->setRedirectUrl(Url::fromPath('group/list', array('backend' => $backend->getName())));
@ -180,7 +180,7 @@ class GroupController extends AuthBackendController
*/ */
public function editAction() public function editAction()
{ {
$this->assertPermission('config/application/groups/edit'); $this->assertPermission('config/authentication/groups/edit');
$groupName = $this->params->getRequired('group'); $groupName = $this->params->getRequired('group');
$backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Updatable'); $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Updatable');
@ -205,7 +205,7 @@ class GroupController extends AuthBackendController
*/ */
public function removeAction() public function removeAction()
{ {
$this->assertPermission('config/application/groups/remove'); $this->assertPermission('config/authentication/groups/remove');
$groupName = $this->params->getRequired('group'); $groupName = $this->params->getRequired('group');
$backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible'); $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');

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

@ -34,11 +34,11 @@ class RoleForm extends ConfigForm
'config/authentication/users/add' => 'config/authentication/users/add', 'config/authentication/users/add' => 'config/authentication/users/add',
'config/authentication/users/edit' => 'config/authentication/users/edit', 'config/authentication/users/edit' => 'config/authentication/users/edit',
'config/authentication/users/remove' => 'config/authentication/users/remove', 'config/authentication/users/remove' => 'config/authentication/users/remove',
'config/application/groups/*' => 'config/application/groups/*', 'config/authentication/groups/*' => 'config/authentication/groups/*',
'config/application/groups/show' => 'config/application/groups/show', 'config/authentication/groups/show' => 'config/authentication/groups/show',
'config/application/groups/add' => 'config/application/groups/add', 'config/authentication/groups/add' => 'config/authentication/groups/add',
'config/application/groups/edit' => 'config/application/groups/edit', 'config/authentication/groups/edit' => 'config/authentication/groups/edit',
'config/application/groups/remove' => 'config/application/groups/remove', 'config/authentication/groups/remove' => 'config/authentication/groups/remove',
'config/application/groups/member/add' => 'config/application/groups/member/add', 'config/application/groups/member/add' => 'config/application/groups/member/add',
'config/application/groups/member/remove' => 'config/application/groups/member/remove', 'config/application/groups/member/remove' => 'config/application/groups/member/remove',
'config/modules' => 'config/modules' 'config/modules' => 'config/modules'

4
application/views/scripts/group/list.phtml
View File

@ -22,8 +22,8 @@ if ($backend === null) {
echo $this->translate('No backend found which is able to list groups') . '</div>'; echo $this->translate('No backend found which is able to list groups') . '</div>';
return; return;
} else { } else {
$extensible = $this->hasPermission('config/application/groups/add') && $backend instanceof Extensible; $extensible = $this->hasPermission('config/authentication/groups/add') && $backend instanceof Extensible;
$reducible = $this->hasPermission('config/application/groups/remove') && $backend instanceof Reducible; $reducible = $this->hasPermission('config/authentication/groups/remove') && $backend instanceof Reducible;
} }
if (count($groups) > 0): ?> if (count($groups) > 0): ?>

4
application/views/scripts/group/show.phtml
View File

@ -3,10 +3,10 @@
use Icinga\Data\Extensible; use Icinga\Data\Extensible;
use Icinga\Data\Updatable; use Icinga\Data\Updatable;
$extensible = $this->hasPermission('config/application/groups/add') && $backend instanceof Extensible; $extensible = $this->hasPermission('config/authentication/groups/add') && $backend instanceof Extensible;
$editLink = null; $editLink = null;
if ($this->hasPermission('config/application/groups/edit') && $backend instanceof Updatable) { if ($this->hasPermission('config/authentication/groups/edit') && $backend instanceof Updatable) {
$editLink = $this->qlink( $editLink = $this->qlink(
null, null,
'group/edit', 'group/edit',

2
application/views/scripts/user/show.phtml
View File

@ -54,7 +54,7 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
<?php foreach ($memberships as $membership): ?> <?php foreach ($memberships as $membership): ?>
<tr> <tr>
<td class="membership-group"> <td class="membership-group">
<?php if ($this->hasPermission('config/application/groups/show') && $membership->backend instanceof Selectable): ?> <?php if ($this->hasPermission('config/authentication/groups/show') && $membership->backend instanceof Selectable): ?>
<?= $this->qlink($membership->group_name, 'group/show', array( <?= $this->qlink($membership->group_name, 'group/show', array(
'backend' => $membership->backend->getName(), 'backend' => $membership->backend->getName(),
'group' => $membership->group_name 'group' => $membership->group_name

2
library/Icinga/Web/Controller/AuthBackendController.php
View File

@ -151,7 +151,7 @@ class AuthBackendController extends Controller
); );
} }
if ($this->hasPermission('config/application/groups/show')) { if ($this->hasPermission('config/authentication/groups/show')) {
$tabs->add( $tabs->add(
'group/list', 'group/list',
array( array(