Improve user controllers and views

2 files changed, 16 insertions, 15 deletions

diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php
index 5540bf88..fbc10abf 100644
--- a/app/ServiceProvider/AuthenticationProvider.php
+++ b/app/ServiceProvider/AuthenticationProvider.php
@@ -100,7 +100,7 @@ class AuthenticationProvider implements ServiceProviderInterface
         $acl->add('TaskExternalLink', '*', Role::PROJECT_MEMBER);
         $acl->add('Taskmodification', '*', Role::PROJECT_MEMBER);
         $acl->add('Taskstatus', '*', Role::PROJECT_MEMBER);
-        $acl->add('UserHelper', array('mention'), Role::PROJECT_MEMBER);
+        $acl->add('UserAjaxController', array('mention'), Role::PROJECT_MEMBER);
 
         return $acl;
     }
@@ -141,8 +141,9 @@ class AuthenticationProvider implements ServiceProviderInterface
         $acl->add('Twofactor', 'disable', Role::APP_ADMIN);
         $acl->add('UserImportController', '*', Role::APP_ADMIN);
         $acl->add('UserCreationController', '*', Role::APP_ADMIN);
-        $acl->add('User', array('index', 'authentication'), Role::APP_ADMIN);
+        $acl->add('UserListController', '*', Role::APP_ADMIN);
         $acl->add('UserStatusController', '*', Role::APP_ADMIN);
+        $acl->add('UserViewController', array('authentication'), Role::APP_ADMIN);
 
         return $acl;
     }
diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php
index a6d6abef..359bd220 100644
--- a/app/ServiceProvider/RouteProvider.php
+++ b/app/ServiceProvider/RouteProvider.php
@@ -144,19 +144,19 @@ class RouteProvider implements ServiceProviderInterface
             $container['route']->addRoute('ical/user/:token', 'ical', 'user');
 
             // Users
-            $container['route']->addRoute('users', 'user', 'index');
-            $container['route']->addRoute('user/profile/:user_id', 'user', 'profile');
-            $container['route']->addRoute('user/show/:user_id', 'user', 'show');
-            $container['route']->addRoute('user/show/:user_id/timesheet', 'user', 'timesheet');
-            $container['route']->addRoute('user/show/:user_id/last-logins', 'user', 'last');
-            $container['route']->addRoute('user/show/:user_id/sessions', 'user', 'sessions');
-            $container['route']->addRoute('user/:user_id/edit', 'user', 'edit');
-            $container['route']->addRoute('user/:user_id/password', 'user', 'password');
-            $container['route']->addRoute('user/:user_id/share', 'user', 'share');
-            $container['route']->addRoute('user/:user_id/notifications', 'user', 'notifications');
-            $container['route']->addRoute('user/:user_id/accounts', 'user', 'external');
-            $container['route']->addRoute('user/:user_id/integrations', 'user', 'integrations');
-            $container['route']->addRoute('user/:user_id/authentication', 'user', 'authentication');
+            $container['route']->addRoute('users', 'UserListController', 'show');
+            $container['route']->addRoute('user/profile/:user_id', 'UserViewController', 'profile');
+            $container['route']->addRoute('user/show/:user_id', 'UserViewController', 'show');
+            $container['route']->addRoute('user/show/:user_id/timesheet', 'UserViewController', 'timesheet');
+            $container['route']->addRoute('user/show/:user_id/last-logins', 'UserViewController', 'lastLogin');
+            $container['route']->addRoute('user/show/:user_id/sessions', 'UserViewController', 'sessions');
+            $container['route']->addRoute('user/:user_id/edit', 'UserViewController', 'edit');
+            $container['route']->addRoute('user/:user_id/password', 'UserViewController', 'password');
+            $container['route']->addRoute('user/:user_id/share', 'UserViewController', 'share');
+            $container['route']->addRoute('user/:user_id/notifications', 'UserViewController', 'notifications');
+            $container['route']->addRoute('user/:user_id/accounts', 'UserViewController', 'external');
+            $container['route']->addRoute('user/:user_id/integrations', 'UserViewController', 'integrations');
+            $container['route']->addRoute('user/:user_id/authentication', 'UserViewController', 'authentication');
             $container['route']->addRoute('user/:user_id/2fa', 'twofactor', 'index');
             $container['route']->addRoute('user/:user_id/avatar', 'AvatarFile', 'show');