summaryrefslogtreecommitdiff
path: root/app/Controller
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2016-06-05 18:22:19 -0400
committerFrederic Guillot <fred@kanboard.net>2016-06-05 18:22:19 -0400
commit5ffdf286e7cebd522f406fbeb83f78e4e4a3b711 (patch)
tree1ab4d8fa6ed4364a4774b933214de36cf596f4e3 /app/Controller
parent9ce6a284193cf07404872a3c3ad746c1f1f4f5db (diff)
Minor fixes
Diffstat (limited to 'app/Controller')
-rw-r--r--app/Controller/ActionCreationController.php4
-rw-r--r--app/Controller/AuthController.php2
-rw-r--r--app/Controller/BaseController.php2
-rw-r--r--app/Controller/PasswordResetController.php10
4 files changed, 14 insertions, 4 deletions
diff --git a/app/Controller/ActionCreationController.php b/app/Controller/ActionCreationController.php
index e984f8d4..abd8abd3 100644
--- a/app/Controller/ActionCreationController.php
+++ b/app/Controller/ActionCreationController.php
@@ -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']),
diff --git a/app/Controller/AuthController.php b/app/Controller/AuthController.php
index dc46070c..d1fba92c 100644
--- a/app/Controller/AuthController.php
+++ b/app/Controller/AuthController.php
@@ -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'));
}
}
diff --git a/app/Controller/BaseController.php b/app/Controller/BaseController.php
index ae2dc006..5233e27f 100644
--- a/app/Controller/BaseController.php
+++ b/app/Controller/BaseController.php
@@ -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';
diff --git a/app/Controller/PasswordResetController.php b/app/Controller/PasswordResetController.php
index 18b4be80..a1780ed9 100644
--- a/app/Controller/PasswordResetController.php
+++ b/app/Controller/PasswordResetController.php
@@ -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)
{