Merge https://github.com/kanboard/kanboard

1 files changed, 5 insertions, 11 deletions

diff --git a/app/Controller/TaskViewController.php b/app/Controller/TaskViewController.php
index bd1e86ae..36597457 100644
--- a/app/Controller/TaskViewController.php
+++ b/app/Controller/TaskViewController.php
@@ -22,7 +22,6 @@ class TaskViewController extends BaseController
     {
         $project = $this->projectModel->getByToken($this->request->getStringParam('token'));
 
-        // Token verification
         if (empty($project)) {
             throw AccessForbiddenException::getInstance()->withoutLayout();
         }
@@ -45,6 +44,7 @@ class TaskViewController extends BaseController
             'task' => $task,
             'columns_list' => $this->columnModel->getList($task['project_id']),
             'colors_list' => $this->colorModel->getList(),
+            'tags' => $this->taskTagModel->getList($task['id']),
             'title' => $task['title'],
             'no_layout' => true,
             'auto_refresh' => true,
@@ -62,19 +62,9 @@ class TaskViewController extends BaseController
         $task = $this->getTask();
         $subtasks = $this->subtaskModel->getAll($task['id']);
 
-        $values = array(
-            'id' => $task['id'],
-            'date_started' => $task['date_started'],
-            'time_estimated' => $task['time_estimated'] ?: '',
-            'time_spent' => $task['time_spent'] ?: '',
-        );
-
-        $values = $this->dateParser->format($values, array('date_started'), $this->dateParser->getUserDateTimeFormat());
-
         $this->response->html($this->helper->layout->task('task/show', array(
             'task' => $task,
             'project' => $this->projectModel->getById($task['project_id']),
-            'values' => $values,
             'files' => $this->taskFileModel->getAllDocuments($task['id']),
             'images' => $this->taskFileModel->getAllImages($task['id']),
             'comments' => $this->commentModel->getAll($task['id'], $this->userSession->getCommentSorting()),
@@ -82,6 +72,7 @@ class TaskViewController extends BaseController
             'internal_links' => $this->taskLinkModel->getAllGroupedByLabel($task['id']),
             'external_links' => $this->taskExternalLinkModel->getAll($task['id']),
             'link_label_list' => $this->linkModel->getList(0, false),
+            'tags' => $this->taskTagModel->getList($task['id']),
         )));
     }
 
@@ -100,6 +91,7 @@ class TaskViewController extends BaseController
             'lead_time' => $this->taskAnalyticModel->getLeadTime($task),
             'cycle_time' => $this->taskAnalyticModel->getCycleTime($task),
             'time_spent_columns' => $this->taskAnalyticModel->getTimeSpentByColumn($task),
+            'tags' => $this->taskTagModel->getList($task['id']),
         )));
     }
 
@@ -124,6 +116,7 @@ class TaskViewController extends BaseController
             'task' => $task,
             'project' => $this->projectModel->getById($task['project_id']),
             'subtask_paginator' => $subtask_paginator,
+            'tags' => $this->taskTagModel->getList($task['id']),
         )));
     }
 
@@ -140,6 +133,7 @@ class TaskViewController extends BaseController
             'task' => $task,
             'project' => $this->projectModel->getById($task['project_id']),
             'transitions' => $this->transitionModel->getAllByTask($task['id']),
+            'tags' => $this->taskTagModel->getList($task['id']),
         )));
     }
 }