diff --git a/app/Controller/ActivityController.php b/app/Controller/ActivityController.php
index 9f9841af6..476e4aac2 100644
--- a/app/Controller/ActivityController.php
+++ b/app/Controller/ActivityController.php
@@ -40,6 +40,7 @@ class ActivityController extends BaseController
'task' => $task,
'project' => $this->projectModel->getById($task['project_id']),
'events' => $this->helper->projectActivity->getTaskEvents($task['id']),
+ 'tags' => $this->taskTagModel->getList($task['id']),
)));
}
}
diff --git a/app/Controller/TaskViewController.php b/app/Controller/TaskViewController.php
index e40ebdc0c..36597457e 100644
--- a/app/Controller/TaskViewController.php
+++ b/app/Controller/TaskViewController.php
@@ -91,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']),
)));
}
@@ -115,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']),
)));
}
@@ -131,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']),
)));
}
}
diff --git a/app/Template/activity/task.php b/app/Template/activity/task.php
index 04c64c632..39953d1a0 100644
--- a/app/Template/activity/task.php
+++ b/app/Template/activity/task.php
@@ -1,9 +1,12 @@
-
-
= $this->text->e($task['title']) ?>
-
+= $this->render('task/details', array(
+ 'task' => $task,
+ 'tags' => $tags,
+ 'project' => $project,
+ 'editable' => false,
+)) ?>
-= $this->render('event/events', array('events' => $events)) ?>
\ No newline at end of file
+= $this->render('event/events', array('events' => $events)) ?>
diff --git a/app/Template/task/analytics.php b/app/Template/task/analytics.php
index db2d0cef0..ecfef242f 100644
--- a/app/Template/task/analytics.php
+++ b/app/Template/task/analytics.php
@@ -1,6 +1,10 @@
-
-
= $this->text->e($task['title']) ?>
-
+= $this->render('task/details', array(
+ 'task' => $task,
+ 'tags' => $tags,
+ 'project' => $project,
+ 'editable' => false,
+)) ?>
+
diff --git a/app/Template/task/show.php b/app/Template/task/show.php
index b18c2bcad..a5c2d5a78 100644
--- a/app/Template/task/show.php
+++ b/app/Template/task/show.php
@@ -8,58 +8,58 @@
)) ?>
-= $this->hook->render('template:task:show:before-description', array('task' => $task, 'project' => $project)) ?>
-= $this->render('task/description', array('task' => $task)) ?>
+ = $this->hook->render('template:task:show:before-description', array('task' => $task, 'project' => $project)) ?>
+ = $this->render('task/description', array('task' => $task)) ?>
-= $this->hook->render('template:task:show:before-subtasks', array('task' => $task, 'project' => $project)) ?>
-= $this->render('subtask/show', array(
- 'task' => $task,
- 'subtasks' => $subtasks,
- 'project' => $project,
- 'editable' => true,
-)) ?>
+ = $this->hook->render('template:task:show:before-subtasks', array('task' => $task, 'project' => $project)) ?>
+ = $this->render('subtask/show', array(
+ 'task' => $task,
+ 'subtasks' => $subtasks,
+ 'project' => $project,
+ 'editable' => true,
+ )) ?>
-= $this->hook->render('template:task:show:before-internal-links', array('task' => $task, 'project' => $project)) ?>
-= $this->render('task_internal_link/show', array(
- 'task' => $task,
- 'links' => $internal_links,
- 'project' => $project,
- 'link_label_list' => $link_label_list,
- 'editable' => true,
- 'is_public' => false,
-)) ?>
+ = $this->hook->render('template:task:show:before-internal-links', array('task' => $task, 'project' => $project)) ?>
+ = $this->render('task_internal_link/show', array(
+ 'task' => $task,
+ 'links' => $internal_links,
+ 'project' => $project,
+ 'link_label_list' => $link_label_list,
+ 'editable' => true,
+ 'is_public' => false,
+ )) ?>
-= $this->hook->render('template:task:show:before-external-links', array('task' => $task, 'project' => $project)) ?>
-= $this->render('task_external_link/show', array(
- 'task' => $task,
- 'links' => $external_links,
- 'project' => $project,
-)) ?>
+ = $this->hook->render('template:task:show:before-external-links', array('task' => $task, 'project' => $project)) ?>
+ = $this->render('task_external_link/show', array(
+ 'task' => $task,
+ 'links' => $external_links,
+ 'project' => $project,
+ )) ?>
-= $this->hook->render('template:task:show:before-attachments', array('task' => $task, 'project' => $project)) ?>
-= $this->render('task_file/show', array(
- 'task' => $task,
- 'files' => $files,
- 'images' => $images
-)) ?>
+ = $this->hook->render('template:task:show:before-attachments', array('task' => $task, 'project' => $project)) ?>
+ = $this->render('task_file/show', array(
+ 'task' => $task,
+ 'files' => $files,
+ 'images' => $images
+ )) ?>
-= $this->hook->render('template:task:show:before-comments', array('task' => $task, 'project' => $project)) ?>
-= $this->render('comments/show', array(
- 'task' => $task,
- 'comments' => $comments,
- 'project' => $project,
- 'editable' => $this->user->hasProjectAccess('CommentController', 'edit', $project['id']),
-)) ?>
+ = $this->hook->render('template:task:show:before-comments', array('task' => $task, 'project' => $project)) ?>
+ = $this->render('comments/show', array(
+ 'task' => $task,
+ 'comments' => $comments,
+ 'project' => $project,
+ 'editable' => $this->user->hasProjectAccess('CommentController', 'edit', $project['id']),
+ )) ?>
= $this->hook->render('template:task:show:bottom', array('task' => $task, 'project' => $project)) ?>
diff --git a/app/Template/task/time_tracking_details.php b/app/Template/task/time_tracking_details.php
index 1a1795224..2b46ca6b3 100644
--- a/app/Template/task/time_tracking_details.php
+++ b/app/Template/task/time_tracking_details.php
@@ -1,6 +1,9 @@
-
-
= $this->text->e($task['title']) ?>
-
+= $this->render('task/details', array(
+ 'task' => $task,
+ 'tags' => $tags,
+ 'project' => $project,
+ 'editable' => false,
+)) ?>
= $this->render('task/time_tracking_summary', array('task' => $task)) ?>
diff --git a/app/Template/task/transitions.php b/app/Template/task/transitions.php
index 9e04c4e1d..6f5f02a62 100644
--- a/app/Template/task/transitions.php
+++ b/app/Template/task/transitions.php
@@ -1,6 +1,9 @@
-
-
= $this->text->e($task['title']) ?>
-
+= $this->render('task/details', array(
+ 'task' => $task,
+ 'tags' => $tags,
+ 'project' => $project,
+ 'editable' => false,
+)) ?>