Minor fixes

This commit is contained in:
Frederic Guillot 2016-06-05 18:22:19 -04:00
parent 9ce6a28419
commit 5ffdf286e7
5 changed files with 15 additions and 5 deletions

View File

@ -40,7 +40,7 @@ class ActionCreationController extends BaseController
return $this->create();
}
$this->response->html($this->template->render('action_creation/event', array(
return $this->response->html($this->template->render('action_creation/event', array(
'values' => $values,
'project' => $project,
'available_actions' => $this->actionManager->getAvailableActions(),
@ -72,7 +72,7 @@ class ActionCreationController extends BaseController
$projects_list = $this->projectUserRoleModel->getActiveProjectsByUser($this->userSession->getId());
unset($projects_list[$project['id']]);
$this->response->html($this->template->render('action_creation/params', array(
return $this->response->html($this->template->render('action_creation/params', array(
'values' => $values,
'action_params' => $action_params,
'columns_list' => $this->columnModel->getList($project['id']),

View File

@ -61,7 +61,7 @@ class AuthController extends BaseController
$this->sessionManager->close();
$this->response->redirect($this->helper->url->to('AuthController', 'login'));
} else {
$this->response->redirect($this->helper->url->to('AuthController', 'index'));
$this->response->redirect($this->helper->url->to('DashboardController', 'show'));
}
}

View File

@ -74,7 +74,7 @@ abstract class BaseController extends Base
{
$task_id = $this->request->getIntegerParam('task_id');
$file_id = $this->request->getIntegerParam('file_id');
$model = 'projectFile';
$model = 'projectFileModel';
if ($task_id > 0) {
$model = 'taskFileModel';

View File

@ -14,6 +14,10 @@ class PasswordResetController extends BaseController
{
/**
* Show the form to reset the password
*
* @param array $values
* @param array $errors
* @throws \Kanboard\Core\Controller\BaseException
*/
public function create(array $values = array(), array $errors = array())
{
@ -46,6 +50,10 @@ class PasswordResetController extends BaseController
/**
* Show the form to set a new password
*
* @param array $values
* @param array $errors
* @throws \Kanboard\Core\Controller\BaseException
*/
public function change(array $values = array(), array $errors = array())
{
@ -93,6 +101,8 @@ class PasswordResetController extends BaseController
/**
* Send the email
*
* @param string $username
*/
private function sendEmail($username)
{

View File

@ -68,7 +68,7 @@ class LastLoginModel extends Base
if (count($connections) >= self::NB_LOGINS) {
$this->db->table(self::TABLE)
->eq('user_id', $user_id)
->notin('id', array_slice($connections, 0, self::NB_LOGINS - 1))
->notIn('id', array_slice($connections, 0, self::NB_LOGINS - 1))
->remove();
}
}