summaryrefslogtreecommitdiff
path: root/app/Controller
diff options
context:
space:
mode:
Diffstat (limited to 'app/Controller')
-rw-r--r--app/Controller/ProjectEdit.php10
-rw-r--r--app/Controller/Taskcreation.php1
-rw-r--r--app/Controller/Taskmodification.php2
3 files changed, 13 insertions, 0 deletions
diff --git a/app/Controller/ProjectEdit.php b/app/Controller/ProjectEdit.php
index 3b0a3da3..0dfc7de3 100644
--- a/app/Controller/ProjectEdit.php
+++ b/app/Controller/ProjectEdit.php
@@ -41,6 +41,16 @@ class ProjectEdit extends Base
}
/**
+ * Change task priority
+ *
+ * @access public
+ */
+ public function priority(array $values = array(), array $errors = array())
+ {
+ $this->renderView('project_edit/task_priority', $values, $errors);
+ }
+
+ /**
* Validate and update a project
*
* @access public
diff --git a/app/Controller/Taskcreation.php b/app/Controller/Taskcreation.php
index 4d74fac6..49ccea7f 100644
--- a/app/Controller/Taskcreation.php
+++ b/app/Controller/Taskcreation.php
@@ -32,6 +32,7 @@ class Taskcreation extends Base
}
$this->response->html($this->template->$method('task_creation/form', array(
+ 'project' => $project,
'ajax' => $this->request->isAjax(),
'errors' => $errors,
'values' => $values + array('project_id' => $project['id']),
diff --git a/app/Controller/Taskmodification.php b/app/Controller/Taskmodification.php
index 81cf430f..2c97970b 100644
--- a/app/Controller/Taskmodification.php
+++ b/app/Controller/Taskmodification.php
@@ -98,6 +98,7 @@ class Taskmodification extends Base
public function edit(array $values = array(), array $errors = array())
{
$task = $this->getTask();
+ $project = $this->project->getById($task['project_id']);
$ajax = $this->request->isAjax();
if (empty($values)) {
@@ -107,6 +108,7 @@ class Taskmodification extends Base
$this->dateParser->format($values, array('date_due'));
$params = array(
+ 'project' => $project,
'values' => $values,
'errors' => $errors,
'task' => $task,