AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve user controllers and views

Browse Source
This commit is contained in:
Frederic Guillot
2016-05-16 20:55:21 -04:00
parent abdf6f9780
commit 4514bc1d4b
49 changed files with 219 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controller/Oauth.php
View File

@@ -49,7 +49,7 @@ class Oauth extends BaseController
$this->link($provider);
} else {
$this->flash->failure(t('The OAuth2 state parameter is invalid'));
$this->response->redirect($this->helper->url->to('user', 'external', array('user_id' => $this->userSession->getId())));
$this->response->redirect($this->helper->url->to('UserViewController', 'external', array('user_id' => $this->userSession->getId())));
}
} else {
if ($hasValidState) {
@@ -75,7 +75,7 @@ class Oauth extends BaseController
$this->flash->success(t('Your external account is linked to your profile successfully.'));
}
$this->response->redirect($this->helper->url->to('user', 'external', array('user_id' => $this->userSession->getId())));
$this->response->redirect($this->helper->url->to('UserViewController', 'external', array('user_id' => $this->userSession->getId())));
}
/**
@@ -94,7 +94,7 @@ class Oauth extends BaseController
$this->flash->failure(t('Unable to unlink your external account.'));
}
$this->response->redirect($this->helper->url->to('user', 'external', array('user_id' => $this->userSession->getId())));
$this->response->redirect($this->helper->url->to('UserViewController', 'external', array('user_id' => $this->userSession->getId())));
}
/**

4
app/Controller/Twofactor.php
View File

@@ -10,7 +10,7 @@ use Kanboard\Core\Controller\AccessForbiddenException;
* @package controller
* @author Frederic Guillot
*/
class Twofactor extends User
class Twofactor extends UserViewController
{
/**
* Only the current user can access to 2FA settings
@@ -192,7 +192,7 @@ class Twofactor extends User
'twofactor_secret' => '',
));
return $this->response->redirect($this->helper->url->to('user', 'show', array('user_id' => $user['id'])));
return $this->response->redirect($this->helper->url->to('UserViewController', 'show', array('user_id' => $user['id'])));
}
return $this->response->html($this->helper->layout->user('twofactor/disable', array(

6
app/Controller/UserHelper.php → app/Controller/UserAjaxController.php
View File

@@ -7,12 +7,12 @@ use Kanboard\Formatter\UserAutoCompleteFormatter;
use Kanboard\Model\User as UserModel;
/**
* User Helper
* User Ajax Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class UserHelper extends BaseController
class UserAjaxController extends BaseController
{
/**
* User auto-completion (Ajax)

4
app/Controller/UserCreationController.php
View File

@@ -74,10 +74,10 @@ class UserCreationController extends BaseController
}
$this->flash->success(t('User created successfully.'));
$this->response->redirect($this->helper->url->to('user', 'show', array('user_id' => $user_id)));
$this->response->redirect($this->helper->url->to('UserViewController', 'show', array('user_id' => $user_id)));
} else {
$this->flash->failure(t('Unable to create your user.'));
$this->response->redirect($this->helper->url->to('user', 'index'));
$this->response->redirect($this->helper->url->to('UserListController', 'show'));
}
}
}

2
app/Controller/UserImportController.php
View File

@@ -43,7 +43,7 @@ class UserImportController extends BaseController
$this->importFile($values, $filename);
}
$this->response->redirect($this->helper->url->to('user', 'index'));
$this->response->redirect($this->helper->url->to('UserListController', 'show'));
}
/**

32
app/Controller/UserListController.php Normal file
View File

@@ -0,0 +1,32 @@
<?php
namespace Kanboard\Controller;
/**
* Class User List Controller
*
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class UserListController extends BaseController
{
/**
* List all users
*
* @access public
*/
public function show()
{
$paginator = $this->paginator
->setUrl('UserListController', 'show')
->setMax(30)
->setOrder('username')
->setQuery($this->user->getQuery())
->calculate();
$this->response->html($this->helper->layout->app('user_list/show', array(
'title' => t('Users').' ('.$paginator->getTotal().')',
'paginator' => $paginator,
)));
}
}

6
app/Controller/UserStatusController.php
View File

@@ -40,7 +40,7 @@ class UserStatusController extends BaseController
$this->flash->failure(t('Unable to remove this user.'));
}
$this->response->redirect($this->helper->url->to('user', 'index'));
$this->response->redirect($this->helper->url->to('UserListController', 'show'));
}
/**
@@ -73,7 +73,7 @@ class UserStatusController extends BaseController
$this->flash->failure(t('Unable to enable this user.'));
}
$this->response->redirect($this->helper->url->to('user', 'index'));
$this->response->redirect($this->helper->url->to('UserListController', 'show'));
}
/**
@@ -106,6 +106,6 @@ class UserStatusController extends BaseController
$this->flash->failure(t('Unable to disable this user.'));
}
$this->response->redirect($this->helper->url->to('user', 'index'));
$this->response->redirect($this->helper->url->to('UserListController', 'show'));
}
}

72
app/Controller/User.php → app/Controller/UserViewController.php
View File

@@ -6,33 +6,13 @@ use Kanboard\Core\Controller\PageNotFoundException;
use Kanboard\Model\Project as ProjectModel;
/**
* User controller
* Class UserViewController
*
* @package controller
* @author Frederic Guillot
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class User extends BaseController
class UserViewController extends BaseController
{
/**
* List all users
*
* @access public
*/
public function index()
{
$paginator = $this->paginator
->setUrl('user', 'index')
->setMax(30)
->setOrder('username')
->setQuery($this->user->getQuery())
->calculate();
$this->response->html($this->helper->layout->app('user/index', array(
'title' => t('Users').' ('.$paginator->getTotal().')',
'paginator' => $paginator,
)));
}
/**
* Public user profile
*
@@ -47,7 +27,7 @@ class User extends BaseController
throw new PageNotFoundException();
}
$this->response->html($this->helper->layout->app('user/profile', array(
$this->response->html($this->helper->layout->app('user_view/profile', array(
'title' => $user['name'] ?: $user['username'],
'user' => $user,
)));
@@ -61,7 +41,7 @@ class User extends BaseController
public function show()
{
$user = $this->getUser();
$this->response->html($this->helper->layout->user('user/show', array(
$this->response->html($this->helper->layout->user('user_view/show', array(
'user' => $user,
'timezones' => $this->timezone->getTimezones(true),
'languages' => $this->language->getLanguages(true),
@@ -78,14 +58,14 @@ class User extends BaseController
$user = $this->getUser();
$subtask_paginator = $this->paginator
->setUrl('user', 'timesheet', array('user_id' => $user['id'], 'pagination' => 'subtasks'))
->setUrl('UserViewController', 'timesheet', array('user_id' => $user['id'], 'pagination' => 'subtasks'))
->setMax(20)
->setOrder('start')
->setDirection('DESC')
->setQuery($this->subtaskTimeTracking->getUserQuery($user['id']))
->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks');
$this->response->html($this->helper->layout->user('user/timesheet', array(
$this->response->html($this->helper->layout->user('user_view/timesheet', array(
'subtask_paginator' => $subtask_paginator,
'user' => $user,
)));
@@ -99,7 +79,7 @@ class User extends BaseController
public function passwordReset()
{
$user = $this->getUser();
$this->response->html($this->helper->layout->user('user/password_reset', array(
$this->response->html($this->helper->layout->user('user_view/password_reset', array(
'tokens' => $this->passwordReset->getAll($user['id']),
'user' => $user,
)));
@@ -110,10 +90,10 @@ class User extends BaseController
*
* @access public
*/
public function last()
public function lastLogin()
{
$user = $this->getUser();
$this->response->html($this->helper->layout->user('user/last', array(
$this->response->html($this->helper->layout->user('user_view/last', array(
'last_logins' => $this->lastLogin->getAll($user['id']),
'user' => $user,
)));
@@ -127,7 +107,7 @@ class User extends BaseController
public function sessions()
{
$user = $this->getUser();
$this->response->html($this->helper->layout->user('user/sessions', array(
$this->response->html($this->helper->layout->user('user_view/sessions', array(
'sessions' => $this->rememberMeSession->getAll($user['id']),
'user' => $user,
)));
@@ -143,7 +123,7 @@ class User extends BaseController
$this->checkCSRFParam();
$user = $this->getUser();
$this->rememberMeSession->remove($this->request->getIntegerParam('id'));
$this->response->redirect($this->helper->url->to('user', 'sessions', array('user_id' => $user['id'])));
$this->response->redirect($this->helper->url->to('UserViewController', 'sessions', array('user_id' => $user['id'])));
}
/**
@@ -159,10 +139,10 @@ class User extends BaseController
$values = $this->request->getValues();
$this->userNotification->saveSettings($user['id'], $values);
$this->flash->success(t('User updated successfully.'));
return $this->response->redirect($this->helper->url->to('user', 'notifications', array('user_id' => $user['id'])));
return $this->response->redirect($this->helper->url->to('UserViewController', 'notifications', array('user_id' => $user['id'])));
}
return $this->response->html($this->helper->layout->user('user/notifications', array(
return $this->response->html($this->helper->layout->user('user_view/notifications', array(
'projects' => $this->projectUserRole->getProjectsByUser($user['id'], array(ProjectModel::ACTIVE)),
'notifications' => $this->userNotification->readSettings($user['id']),
'types' => $this->userNotificationType->getTypes(),
@@ -184,10 +164,10 @@ class User extends BaseController
$values = $this->request->getValues();
$this->userMetadata->save($user['id'], $values);
$this->flash->success(t('User updated successfully.'));
$this->response->redirect($this->helper->url->to('user', 'integrations', array('user_id' => $user['id'])));
$this->response->redirect($this->helper->url->to('UserViewController', 'integrations', array('user_id' => $user['id'])));
}
$this->response->html($this->helper->layout->user('user/integrations', array(
$this->response->html($this->helper->layout->user('user_view/integrations', array(
'user' => $user,
'values' => $this->userMetadata->getAll($user['id']),
)));
@@ -201,7 +181,7 @@ class User extends BaseController
public function external()
{
$user = $this->getUser();
$this->response->html($this->helper->layout->user('user/external', array(
$this->response->html($this->helper->layout->user('user_view/external', array(
'last_logins' => $this->lastLogin->getAll($user['id']),
'user' => $user,
)));
@@ -226,10 +206,10 @@ class User extends BaseController
$this->flash->failure(t('Unable to update this user.'));
}
return $this->response->redirect($this->helper->url->to('user', 'share', array('user_id' => $user['id'])));
return $this->response->redirect($this->helper->url->to('UserViewController', 'share', array('user_id' => $user['id'])));
}
return $this->response->html($this->helper->layout->user('user/share', array(
return $this->response->html($this->helper->layout->user('user_view/share', array(
'user' => $user,
'title' => t('Public access'),
)));
@@ -257,11 +237,11 @@ class User extends BaseController
$this->flash->failure(t('Unable to change the password.'));
}
return $this->response->redirect($this->helper->url->to('user', 'show', array('user_id' => $user['id'])));
return $this->response->redirect($this->helper->url->to('UserViewController', 'show', array('user_id' => $user['id'])));
}
}
return $this->response->html($this->helper->layout->user('user/password', array(
return $this->response->html($this->helper->layout->user('user_view/password', array(
'values' => $values,
'errors' => $errors,
'user' => $user,
@@ -299,11 +279,11 @@ class User extends BaseController
$this->flash->failure(t('Unable to update your user.'));
}
return $this->response->redirect($this->helper->url->to('user', 'show', array('user_id' => $user['id'])));
return $this->response->redirect($this->helper->url->to('UserViewController', 'show', array('user_id' => $user['id'])));
}
}
return $this->response->html($this->helper->layout->user('user/edit', array(
return $this->response->html($this->helper->layout->user('user_view/edit', array(
'values' => $values,
'errors' => $errors,
'user' => $user,
@@ -337,11 +317,11 @@ class User extends BaseController
$this->flash->failure(t('Unable to update your user.'));
}
return $this->response->redirect($this->helper->url->to('user', 'authentication', array('user_id' => $user['id'])));
return $this->response->redirect($this->helper->url->to('UserViewController', 'authentication', array('user_id' => $user['id'])));
}
}
return $this->response->html($this->helper->layout->user('user/authentication', array(
return $this->response->html($this->helper->layout->user('user_view/authentication', array(
'values' => $values,
'errors' => $errors,
'user' => $user,