Display same task summary on all task view pages
This commit is contained in:
parent
ada3e6f89d
commit
521379a350
|
|
@ -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']),
|
||||
)));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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']),
|
||||
)));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
<div class="task-show-title color-<?= $task['color_id'] ?>">
|
||||
<h2><?= $this->text->e($task['title']) ?></h2>
|
||||
</div>
|
||||
<?= $this->render('task/details', array(
|
||||
'task' => $task,
|
||||
'tags' => $tags,
|
||||
'project' => $project,
|
||||
'editable' => false,
|
||||
)) ?>
|
||||
|
||||
<div class="page-header">
|
||||
<h2><?= t('Activity stream') ?></h2>
|
||||
</div>
|
||||
|
||||
<?= $this->render('event/events', array('events' => $events)) ?>
|
||||
<?= $this->render('event/events', array('events' => $events)) ?>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
<div class="task-show-title color-<?= $task['color_id'] ?>">
|
||||
<h2><?= $this->text->e($task['title']) ?></h2>
|
||||
</div>
|
||||
<?= $this->render('task/details', array(
|
||||
'task' => $task,
|
||||
'tags' => $tags,
|
||||
'project' => $project,
|
||||
'editable' => false,
|
||||
)) ?>
|
||||
|
||||
<div class="page-header">
|
||||
<h2><?= t('Analytics') ?></h2>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,58 +8,58 @@
|
|||
)) ?>
|
||||
|
||||
<?php if (!empty($task['description'])): ?>
|
||||
<?= $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)) ?>
|
||||
<?php endif ?>
|
||||
|
||||
<?php if(!empty($subtasks)): ?>
|
||||
<?= $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,
|
||||
)) ?>
|
||||
<?php endif ?>
|
||||
|
||||
<?php if (!empty($internal_links)): ?>
|
||||
<?= $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,
|
||||
)) ?>
|
||||
<?php endif ?>
|
||||
|
||||
<?php if (!empty($external_links)): ?>
|
||||
<?= $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,
|
||||
)) ?>
|
||||
<?php endif ?>
|
||||
|
||||
<?php if (!empty($files) || !empty($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-attachments', array('task' => $task, 'project' => $project)) ?>
|
||||
<?= $this->render('task_file/show', array(
|
||||
'task' => $task,
|
||||
'files' => $files,
|
||||
'images' => $images
|
||||
)) ?>
|
||||
<?php endif ?>
|
||||
|
||||
<?php if (!empty($comments)): ?>
|
||||
<?= $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']),
|
||||
)) ?>
|
||||
<?php endif ?>
|
||||
|
||||
<?= $this->hook->render('template:task:show:bottom', array('task' => $task, 'project' => $project)) ?>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
<div class="task-show-title color-<?= $task['color_id'] ?>">
|
||||
<h2><?= $this->text->e($task['title']) ?></h2>
|
||||
</div>
|
||||
<?= $this->render('task/details', array(
|
||||
'task' => $task,
|
||||
'tags' => $tags,
|
||||
'project' => $project,
|
||||
'editable' => false,
|
||||
)) ?>
|
||||
|
||||
<?= $this->render('task/time_tracking_summary', array('task' => $task)) ?>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
<div class="task-show-title color-<?= $task['color_id'] ?>">
|
||||
<h2><?= $this->text->e($task['title']) ?></h2>
|
||||
</div>
|
||||
<?= $this->render('task/details', array(
|
||||
'task' => $task,
|
||||
'tags' => $tags,
|
||||
'project' => $project,
|
||||
'editable' => false,
|
||||
)) ?>
|
||||
|
||||
<div class="page-header">
|
||||
<h2><?= t('Transitions') ?></h2>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -27,12 +27,3 @@
|
|||
color: color('medium')
|
||||
li
|
||||
line-height: 23px
|
||||
|
||||
.task-show-title
|
||||
border: 2px solid #000
|
||||
border-radius: 8px
|
||||
margin-bottom: 20px
|
||||
h2
|
||||
color: color('medium')
|
||||
margin: 0
|
||||
padding: 8px
|
||||
|
|
|
|||
Loading…
Reference in New Issue