AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull-request #745

Browse Source
This commit is contained in:
Frederic Guillot
2015-03-30 20:45:31 -04:00
parent fe154443fa 0ae832d76d
commit cb02acba94
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Model/Subtask.php
View File

@@ -98,6 +98,7 @@ class Subtask extends Base
Subtask::TABLE.'.*', Subtask::TABLE.'.*',
Task::TABLE.'.project_id', Task::TABLE.'.project_id',
Task::TABLE.'.color_id', Task::TABLE.'.color_id',
Task::TABLE.'.title AS task_name',
Project::TABLE.'.name AS project_name' Project::TABLE.'.name AS project_name'
) )
->eq('user_id', $user_id) ->eq('user_id', $user_id)

4
app/Template/app/subtasks.php
View File

@@ -6,6 +6,7 @@
<tr> <tr>
<th class="column-10"><?= $paginator->order('Id', 'tasks.id') ?></th> <th class="column-10"><?= $paginator->order('Id', 'tasks.id') ?></th>
<th class="column-20"><?= $paginator->order(t('Project'), 'project_name') ?></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><?= $paginator->order(t('Subtask'), 'title') ?></th>
<th class="column-20"><?= t('Time tracking') ?></th> <th class="column-20"><?= t('Time tracking') ?></th>
</tr> </tr>
@@ -17,6 +18,9 @@
<td> <td>
<?= $this->a($this->e($subtask['project_name']), 'board', 'show', array('project_id' => $subtask['project_id'])) ?> <?= $this->a($this->e($subtask['project_name']), 'board', 'show', array('project_id' => $subtask['project_id'])) ?>
</td> </td>
<td>
<?= $this->a($this->e($subtask['task_name']), 'task', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?>
</td>
<td> <td>
<?= $this->toggleSubtaskStatus($subtask, 'dashboard') ?> <?= $this->toggleSubtaskStatus($subtask, 'dashboard') ?>
</td> </td>