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

Show project name in task forms

Browse Source
This commit is contained in:
Frederic Guillot
2016-08-07 10:31:48 -04:00
parent 928d27d2ad
commit c0ee8b4092
7 changed files with 63 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Controller/TaskModificationController.php
View File

@@ -37,11 +37,7 @@ class TaskModificationController extends BaseController
$project = $this->projectModel->getById($task['project_id']);
if (empty($values)) {
$values = $task;
$values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
$values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values));
$values = $this->dateParser->format($values, array('date_due'), $this->dateParser->getUserDateFormat());
$values = $this->dateParser->format($values, array('date_started'), $this->dateParser->getUserDateTimeFormat());
$values = $this->prepareValues($task);
}
$this->response->html($this->template->render('task_modification/show', array(
@@ -75,4 +71,22 @@ class TaskModificationController extends BaseController
$this->edit($values, $errors);
}
}
/**
* Prepare form values
*
* @access protected
* @param array $task
* @return array
*/
protected function prepareValues(array $task)
{
$values = $task;
$values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
$values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values));
$values = $this->dateParser->format($values, array('date_due'), $this->dateParser->getUserDateFormat());
$values = $this->dateParser->format($values, array('date_started'), $this->dateParser->getUserDateTimeFormat());
return $values;
}
}