summaryrefslogtreecommitdiff
path: root/app/Controller
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2016-05-15 20:09:43 -0400
committerFrederic Guillot <fred@kanboard.net>2016-05-15 20:09:43 -0400
commit8a6f02735b628033a3284d06a9f633bd260e19ef (patch)
tree57d0c2acb22d6afe0412903a088ed77ac0ba3596 /app/Controller
parent67b836164997527b91452b19adbcb8aa3c5decf1 (diff)
Added task creation menu for all projects views
Diffstat (limited to 'app/Controller')
-rw-r--r--app/Controller/DashboardController.php6
-rw-r--r--app/Controller/TaskBulkController.php (renamed from app/Controller/TaskBulk.php)4
-rw-r--r--app/Controller/TaskCreationController.php (renamed from app/Controller/Taskcreation.php)14
3 files changed, 12 insertions, 12 deletions
diff --git a/app/Controller/DashboardController.php b/app/Controller/DashboardController.php
index b05cd209..145e0bff 100644
--- a/app/Controller/DashboardController.php
+++ b/app/Controller/DashboardController.php
@@ -81,9 +81,9 @@ class DashboardController extends BaseController
$this->response->html($this->helper->layout->dashboard('dashboard/show', array(
'title' => t('Dashboard'),
- 'project_paginator' => $this->getProjectPaginator($user['id'], 'index', 10),
- 'task_paginator' => $this->getTaskPaginator($user['id'], 'index', 10),
- 'subtask_paginator' => $this->getSubtaskPaginator($user['id'], 'index', 10),
+ 'project_paginator' => $this->getProjectPaginator($user['id'], 'show', 10),
+ 'task_paginator' => $this->getTaskPaginator($user['id'], 'show', 10),
+ 'subtask_paginator' => $this->getSubtaskPaginator($user['id'], 'show', 10),
'user' => $user,
)));
}
diff --git a/app/Controller/TaskBulk.php b/app/Controller/TaskBulkController.php
index d0a1b276..4b4a2594 100644
--- a/app/Controller/TaskBulk.php
+++ b/app/Controller/TaskBulkController.php
@@ -3,11 +3,11 @@
namespace Kanboard\Controller;
/**
- * Class TaskBulk
+ * Class TaskBulkController
*
* @package Kanboard\Controller
*/
-class TaskBulk extends BaseController
+class TaskBulkController extends BaseController
{
/**
* Show the form
diff --git a/app/Controller/Taskcreation.php b/app/Controller/TaskCreationController.php
index af7d0c80..2a63ddcc 100644
--- a/app/Controller/Taskcreation.php
+++ b/app/Controller/TaskCreationController.php
@@ -3,12 +3,12 @@
namespace Kanboard\Controller;
/**
- * Task Creation controller
+ * Task Creation Controller
*
- * @package controller
+ * @package Kanboard\Controller
* @author Frederic Guillot
*/
-class Taskcreation extends BaseController
+class TaskCreationController extends BaseController
{
/**
* Display a form to create a new task
@@ -18,7 +18,7 @@ class Taskcreation extends BaseController
* @param array $errors
* @throws \Kanboard\Core\Controller\PageNotFoundException
*/
- public function create(array $values = array(), array $errors = array())
+ public function show(array $values = array(), array $errors = array())
{
$project = $this->getProject();
$swimlanes_list = $this->swimlane->getList($project['id'], false, true);
@@ -35,7 +35,7 @@ class Taskcreation extends BaseController
$values = $this->hook->merge('controller:task-creation:form:default', $values, array('default_values' => $values));
}
- $this->response->html($this->template->render('task_creation/form', array(
+ $this->response->html($this->template->render('task_creation/show', array(
'project' => $project,
'errors' => $errors,
'values' => $values + array('project_id' => $project['id']),
@@ -66,13 +66,13 @@ class Taskcreation extends BaseController
}
$this->flash->failure(t('Unable to create your task.'));
- return $this->create($values, $errors);
+ return $this->show($values, $errors);
}
private function afterSave(array $project, array &$values)
{
if (isset($values['another_task']) && $values['another_task'] == 1) {
- return $this->create(array(
+ return $this->show(array(
'owner_id' => $values['owner_id'],
'color_id' => $values['color_id'],
'category_id' => isset($values['category_id']) ? $values['category_id'] : 0,