diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php index ef95dc3fc..fe8dd58f8 100644 --- a/application/controllers/GroupController.php +++ b/application/controllers/GroupController.php @@ -129,7 +129,7 @@ class GroupController extends AuthBackendController $this->view->members = $members; $this->createShowTabs($backend->getName(), $groupName)->activate('group/show'); - if ($this->hasPermission('config/application/groups/member/remove') && $backend instanceof Reducible) { + if ($this->hasPermission('config/authentication/groups/edit') && $backend instanceof Reducible) { $removeForm = new Form(); $removeForm->setUidDisabled(); $removeForm->setAction( @@ -228,7 +228,7 @@ class GroupController extends AuthBackendController */ public function addmemberAction() { - $this->assertPermission('config/application/groups/member/add'); + $this->assertPermission('config/authentication/groups/edit'); $groupName = $this->params->getRequired('group'); $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible'); @@ -256,7 +256,7 @@ class GroupController extends AuthBackendController */ public function removememberAction() { - $this->assertPermission('config/application/groups/member/remove'); + $this->assertPermission('config/authentication/groups/edit'); $this->assertHttpMethod('POST'); $groupName = $this->params->getRequired('group'); $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible'); diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php index a8db8d541..30e0bc100 100644 --- a/application/controllers/UserController.php +++ b/application/controllers/UserController.php @@ -121,7 +121,7 @@ class UserController extends AuthBackendController $memberships ); - if ($this->hasPermission('config/application/groups/member/add')) { + if ($this->hasPermission('config/authentication/groups/edit')) { $extensibleBackends = $this->loadUserGroupBackends('Icinga\Data\Extensible'); $this->view->showCreateMembershipLink = ! empty($extensibleBackends); } else { @@ -133,7 +133,7 @@ class UserController extends AuthBackendController $this->view->memberships = $memberships; $this->createShowTabs($backend->getName(), $userName)->activate('user/show'); - if ($this->hasPermission('config/application/groups/member/remove')) { + if ($this->hasPermission('config/authentication/groups/edit')) { $removeForm = new Form(); $removeForm->setUidDisabled(); $removeForm->addElement('hidden', 'user_name', array( @@ -228,7 +228,7 @@ class UserController extends AuthBackendController */ public function createmembershipAction() { - $this->assertPermission('config/application/groups/member/add'); + $this->assertPermission('config/authentication/groups/edit'); $userName = $this->params->getRequired('user'); $backend = $this->getUserBackend($this->params->getRequired('backend')); diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php index 7175b0931..afedf772f 100644 --- a/application/forms/Security/RoleForm.php +++ b/application/forms/Security/RoleForm.php @@ -38,8 +38,6 @@ class RoleForm extends ConfigForm 'config/authentication/groups/add' => 'config/authentication/groups/add', 'config/authentication/groups/edit' => 'config/authentication/groups/edit', 'config/authentication/groups/remove' => 'config/authentication/groups/remove', - 'config/application/groups/member/add' => 'config/application/groups/member/add', - 'config/application/groups/member/remove' => 'config/application/groups/member/remove', 'config/authentication/roles/*' => 'config/authentication/roles/*', 'config/authentication/roles/show' => 'config/authentication/roles/show', 'config/authentication/roles/add' => 'config/authentication/roles/add',