From de8ce875f4295e0b3bef20fcca051401f96816ef Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 15 May 2016 21:54:50 -0400 Subject: [PATCH] Rename UserStatus controller --- .../{UserStatus.php => UserStatusController.php} | 4 ++-- app/ServiceProvider/AuthenticationProvider.php | 2 +- app/Template/user/dropdown.php | 14 +++++++------- app/Template/user_status/disable.php | 2 +- app/Template/user_status/enable.php | 2 +- app/Template/user_status/remove.php | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename app/Controller/{UserStatus.php => UserStatusController.php} (96%) diff --git a/app/Controller/UserStatus.php b/app/Controller/UserStatusController.php similarity index 96% rename from app/Controller/UserStatus.php rename to app/Controller/UserStatusController.php index 6f93e9534..2b23505c1 100644 --- a/app/Controller/UserStatus.php +++ b/app/Controller/UserStatusController.php @@ -5,10 +5,10 @@ namespace Kanboard\Controller; /** * User Status Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class UserStatus extends BaseController +class UserStatusController extends BaseController { /** * Confirm remove a user diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php index 9c845905c..82f61e111 100644 --- a/app/ServiceProvider/AuthenticationProvider.php +++ b/app/ServiceProvider/AuthenticationProvider.php @@ -140,7 +140,7 @@ class AuthenticationProvider implements ServiceProviderInterface $acl->add('UserImportController', '*', Role::APP_ADMIN); $acl->add('UserCreationController', '*', Role::APP_ADMIN); $acl->add('User', array('index', 'authentication'), Role::APP_ADMIN); - $acl->add('UserStatus', '*', Role::APP_ADMIN); + $acl->add('UserStatusController', '*', Role::APP_ADMIN); return $acl; } diff --git a/app/Template/user/dropdown.php b/app/Template/user/dropdown.php index b74ed6e08..086bf01b4 100644 --- a/app/Template/user/dropdown.php +++ b/app/Template/user/dropdown.php @@ -5,23 +5,23 @@ url->link(t('View profile'), 'user', 'show', array('user_id' => $user['id'])) ?> - user->hasAccess('UserStatus', 'disable') && ! $this->user->isCurrentUser($user['id'])): ?> + user->hasAccess('UserStatusController', 'disable') && ! $this->user->isCurrentUser($user['id'])): ?>
  • - url->link(t('Disable'), 'UserStatus', 'confirmDisable', array('user_id' => $user['id']), false, 'popover') ?> + url->link(t('Disable'), 'UserStatusController', 'confirmDisable', array('user_id' => $user['id']), false, 'popover') ?>
  • - user->hasAccess('UserStatus', 'enable') && ! $this->user->isCurrentUser($user['id'])): ?> + user->hasAccess('UserStatusController', 'enable') && ! $this->user->isCurrentUser($user['id'])): ?>
  • - url->link(t('Enable'), 'UserStatus', 'confirmEnable', array('user_id' => $user['id']), false, 'popover') ?> + url->link(t('Enable'), 'UserStatusController', 'confirmEnable', array('user_id' => $user['id']), false, 'popover') ?>
  • - user->hasAccess('UserStatus', 'remove') && ! $this->user->isCurrentUser($user['id'])): ?> + user->hasAccess('UserStatusController', 'remove') && ! $this->user->isCurrentUser($user['id'])): ?>
  • - url->link(t('Remove'), 'UserStatus', 'confirmRemove', array('user_id' => $user['id']), false, 'popover') ?> + url->link(t('Remove'), 'UserStatusController', 'confirmRemove', array('user_id' => $user['id']), false, 'popover') ?>
  • - \ No newline at end of file + diff --git a/app/Template/user_status/disable.php b/app/Template/user_status/disable.php index 90d8c7578..b551b3b8d 100644 --- a/app/Template/user_status/disable.php +++ b/app/Template/user_status/disable.php @@ -6,7 +6,7 @@

    - url->link(t('Yes'), 'UserStatus', 'disable', array('user_id' => $user['id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'UserStatusController', 'disable', array('user_id' => $user['id']), true, 'btn btn-red') ?> url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?>
    diff --git a/app/Template/user_status/enable.php b/app/Template/user_status/enable.php index cd3d49471..fe527047c 100644 --- a/app/Template/user_status/enable.php +++ b/app/Template/user_status/enable.php @@ -6,7 +6,7 @@

    - url->link(t('Yes'), 'UserStatus', 'enable', array('user_id' => $user['id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'UserStatusController', 'enable', array('user_id' => $user['id']), true, 'btn btn-red') ?> url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?>
    diff --git a/app/Template/user_status/remove.php b/app/Template/user_status/remove.php index cd5c09a60..c84580927 100644 --- a/app/Template/user_status/remove.php +++ b/app/Template/user_status/remove.php @@ -6,7 +6,7 @@

    - url->link(t('Yes'), 'UserStatus', 'remove', array('user_id' => $user['id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'UserStatusController', 'remove', array('user_id' => $user['id']), true, 'btn btn-red') ?> url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?>