tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

refs #8826
This commit is contained in:
Johannes Meyer 2015-06-02 09:02:57 +02:00
parent 46e2393074
commit a558f2873a
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/controllers/UserController.php
View File

@ -30,7 +30,7 @@ class UserController extends AuthBackendController
*/
public function listAction()
{
$this->assertPermission('config/application/users/show');
$this->assertPermission('config/authentication/users/show');
$backendNames = array_map(
function ($b) { return $b->getName(); },
$this->loadUserBackends('Icinga\Data\Selectable')
@ -88,7 +88,7 @@ class UserController extends AuthBackendController
*/
public function showAction()
{
$this->assertPermission('config/application/users/show');
$this->assertPermission('config/authentication/users/show');
$userName = $this->params->getRequired('user');
$backend = $this->getUserBackend($this->params->getRequired('backend'));
@ -166,7 +166,7 @@ class UserController extends AuthBackendController
*/
public function addAction()
{
$this->assertPermission('config/application/users/add');
$this->assertPermission('config/authentication/users/add');
$backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible');
$form = new UserForm();
$form->setRedirectUrl(Url::fromPath('user/list', array('backend' => $backend->getName())));
@ -182,7 +182,7 @@ class UserController extends AuthBackendController
*/
public function editAction()
{
$this->assertPermission('config/application/users/edit');
$this->assertPermission('config/authentication/users/edit');
$userName = $this->params->getRequired('user');
$backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Updatable');
@ -205,7 +205,7 @@ class UserController extends AuthBackendController
*/
public function removeAction()
{
$this->assertPermission('config/application/users/remove');
$this->assertPermission('config/authentication/users/remove');
$userName = $this->params->getRequired('user');
$backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');

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

@ -29,11 +29,11 @@ class RoleForm extends ConfigForm
'config/application/resources' => 'config/application/resources',
'config/application/usergroupbackend' => 'config/application/usergroupbackend',
'config/application/roles' => 'config/application/roles',
'config/application/users/*' => 'config/application/users/*',
'config/application/users/show' => 'config/application/users/show',
'config/application/users/add' => 'config/application/users/add',
'config/application/users/edit' => 'config/application/users/edit',
'config/application/users/remove' => 'config/application/users/remove',
'config/authentication/users/*' => 'config/authentication/users/*',
'config/authentication/users/show' => 'config/authentication/users/show',
'config/authentication/users/add' => 'config/authentication/users/add',
'config/authentication/users/edit' => 'config/authentication/users/edit',
'config/authentication/users/remove' => 'config/authentication/users/remove',
'config/application/groups/*' => 'config/application/groups/*',
'config/application/groups/show' => 'config/application/groups/show',
'config/application/groups/add' => 'config/application/groups/add',

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

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

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

@ -5,7 +5,7 @@ use Icinga\Data\Reducible;
use Icinga\Data\Selectable;
$editLink = null;
if ($this->hasPermission('config/application/users/edit') && $backend instanceof Updatable) {
if ($this->hasPermission('config/authentication/users/edit') && $backend instanceof Updatable) {
$editLink = $this->qlink(
null,
'user/edit',

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

@ -139,7 +139,7 @@ class AuthBackendController extends Controller
{
$tabs = $this->getTabs();
if ($this->hasPermission('config/application/users/show')) {
if ($this->hasPermission('config/authentication/users/show')) {
$tabs->add(
'user/list',
array(