diff options
| author | Frederic Guillot <fred@kanboard.net> | 2016-06-05 21:28:56 -0400 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2016-06-05 21:28:56 -0400 |
| commit | 656f4306325d7944280ce111d95aeaeacab8d3cd (patch) | |
| tree | 9fe6e6631b2b1d14feb1344e2b78186db9a07a04 /app/Controller | |
| parent | 33098e4e11ba451d0b4fed7f8f41820e2bb66bd4 (diff) | |
Changed DateParser to use only user format and ISO-8601
Diffstat (limited to 'app/Controller')
| -rw-r--r-- | app/Controller/TaskModificationController.php | 5 | ||||
| -rw-r--r-- | app/Controller/TaskViewController.php | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/Controller/TaskModificationController.php b/app/Controller/TaskModificationController.php index fc9113dd..50583df4 100644 --- a/app/Controller/TaskModificationController.php +++ b/app/Controller/TaskModificationController.php @@ -91,11 +91,10 @@ class TaskModificationController extends BaseController $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->dateParser->format($values, array('date_due'), $this->configModel->get('application_date_format', DateParser::DATE_FORMAT)); - $values = $this->dateParser->format($values, array('date_started'), $this->configModel->get('application_datetime_format', DateParser::DATE_TIME_FORMAT)); - $this->response->html($this->template->render('task_modification/edit_task', array( 'project' => $project, 'values' => $values, diff --git a/app/Controller/TaskViewController.php b/app/Controller/TaskViewController.php index 2a79ee45..073434b2 100644 --- a/app/Controller/TaskViewController.php +++ b/app/Controller/TaskViewController.php @@ -70,7 +70,7 @@ class TaskViewController extends BaseController 'time_spent' => $task['time_spent'] ?: '', ); - $values = $this->dateParser->format($values, array('date_started'), $this->configModel->get('application_datetime_format', DateParser::DATE_TIME_FORMAT)); + $values = $this->dateParser->format($values, array('date_started'), $this->dateParser->getUserDateTimeFormat()); $this->response->html($this->helper->layout->task('task/show', array( 'task' => $task, |