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

Show project name in task links

Browse Source
This commit is contained in:
xavier.vidal
2015-09-25 17:16:34 +02:00
parent 55afa4fd78
commit 2aa28a01d6
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Model/TaskLink.php
View File

@@ -82,13 +82,15 @@ class TaskLink extends Base
Task::TABLE.'.owner_id AS task_assignee_id', Task::TABLE.'.owner_id AS task_assignee_id',
User::TABLE.'.username AS task_assignee_username', User::TABLE.'.username AS task_assignee_username',
User::TABLE.'.name AS task_assignee_name', User::TABLE.'.name AS task_assignee_name',
Board::TABLE.'.title AS column_title' Board::TABLE.'.title AS column_title',
Project::TABLE.'.name AS project_name'
) )
->eq(self::TABLE.'.task_id', $task_id) ->eq(self::TABLE.'.task_id', $task_id)
->join(Link::TABLE, 'id', 'link_id') ->join(Link::TABLE, 'id', 'link_id')
->join(Task::TABLE, 'id', 'opposite_task_id') ->join(Task::TABLE, 'id', 'opposite_task_id')
->join(Board::TABLE, 'id', 'column_id', Task::TABLE) ->join(Board::TABLE, 'id', 'column_id', Task::TABLE)
->join(User::TABLE, 'id', 'owner_id', Task::TABLE) ->join(User::TABLE, 'id', 'owner_id', Task::TABLE)
->join(Project::TABLE, 'id', 'project_id', Task::TABLE)
->asc(Link::TABLE.'.id') ->asc(Link::TABLE.'.id')
->desc(Board::TABLE.'.position') ->desc(Board::TABLE.'.position')
->desc(Task::TABLE.'.is_active') ->desc(Task::TABLE.'.is_active')

2
app/Template/tasklink/show.php
View File

@@ -6,6 +6,7 @@
<tr> <tr>
<th class="column-20"><?= t('Label') ?></th> <th class="column-20"><?= t('Label') ?></th>
<th class="column-30"><?= t('Task') ?></th> <th class="column-30"><?= t('Task') ?></th>
<th class="column-20"><?= t('Project') ?></th>
<th><?= t('Column') ?></th> <th><?= t('Column') ?></th>
<th><?= t('Assignee') ?></th> <th><?= t('Assignee') ?></th>
<?php if (! isset($not_editable)): ?> <?php if (! isset($not_editable)): ?>
@@ -52,6 +53,7 @@
<strong><?= $this->e($link['task_time_estimated']).'h' ?></strong> <?= t('estimated') ?> <strong><?= $this->e($link['task_time_estimated']).'h' ?></strong> <?= t('estimated') ?>
<?php endif ?> <?php endif ?>
</td> </td>
<td><?= $this->e($link['project_name']) ?></td>
<td><?= $this->e($link['column_title']) ?></td> <td><?= $this->e($link['column_title']) ?></td>
<td> <td>
<?php if (! empty($link['task_assignee_username'])): ?> <?php if (! empty($link['task_assignee_username'])): ?>