diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-03-30 20:45:31 -0400 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-03-30 20:45:31 -0400 |
| commit | cb02acba94bf9966a1dcf58d7e6bf0d60aeb4c4a (patch) | |
| tree | a15f6ba0660b5c7189c7d71a24af9a7a2a83c755 /app | |
| parent | fe154443fa654afda77ba47524cfb1917f2d3ded (diff) | |
| parent | 0ae832d76de02f1894fc136d52605fe0d9fff59a (diff) | |
Merge pull-request #745
Diffstat (limited to 'app')
| -rw-r--r-- | app/Model/Subtask.php | 1 | ||||
| -rw-r--r-- | app/Template/app/subtasks.php | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/Model/Subtask.php b/app/Model/Subtask.php index e33373e0..492f3a77 100644 --- a/app/Model/Subtask.php +++ b/app/Model/Subtask.php @@ -98,6 +98,7 @@ class Subtask extends Base Subtask::TABLE.'.*', Task::TABLE.'.project_id', Task::TABLE.'.color_id', + Task::TABLE.'.title AS task_name', Project::TABLE.'.name AS project_name' ) ->eq('user_id', $user_id) diff --git a/app/Template/app/subtasks.php b/app/Template/app/subtasks.php index fdfbdf2f..487b66fc 100644 --- a/app/Template/app/subtasks.php +++ b/app/Template/app/subtasks.php @@ -6,6 +6,7 @@ <tr> <th class="column-10"><?= $paginator->order('Id', 'tasks.id') ?></th> <th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></th> + <th><?= $paginator->order(t('Task'), 'task_name') ?></th> <th><?= $paginator->order(t('Subtask'), 'title') ?></th> <th class="column-20"><?= t('Time tracking') ?></th> </tr> @@ -18,6 +19,9 @@ <?= $this->a($this->e($subtask['project_name']), 'board', 'show', array('project_id' => $subtask['project_id'])) ?> </td> <td> + <?= $this->a($this->e($subtask['task_name']), 'task', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?> + </td> + <td> <?= $this->toggleSubtaskStatus($subtask, 'dashboard') ?> </td> <td> |