summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxavier.vidal <xavier.vidal@MAC-0614-002.local>2015-09-25 17:16:34 +0200
committerxavier.vidal <xavier.vidal@MAC-0614-002.local>2015-09-25 17:16:34 +0200
commit2aa28a01d63ca1c58cd3aff0a84bbfcbeb871f1f (patch)
tree68143ec13b62ed6ff49168c141df6bae08cab43a
parent55afa4fd7879dcd4d0b20d29975ba79d03331e29 (diff)
Show project name in task links
-rw-r--r--app/Model/TaskLink.php4
-rw-r--r--app/Template/tasklink/show.php2
2 files changed, 5 insertions, 1 deletions
diff --git a/app/Model/TaskLink.php b/app/Model/TaskLink.php
index 466e44df..1c7d6287 100644
--- a/app/Model/TaskLink.php
+++ b/app/Model/TaskLink.php
@@ -82,13 +82,15 @@ class TaskLink extends Base
Task::TABLE.'.owner_id AS task_assignee_id',
User::TABLE.'.username AS task_assignee_username',
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)
->join(Link::TABLE, 'id', 'link_id')
->join(Task::TABLE, 'id', 'opposite_task_id')
->join(Board::TABLE, 'id', 'column_id', Task::TABLE)
->join(User::TABLE, 'id', 'owner_id', Task::TABLE)
+ ->join(Project::TABLE, 'id', 'project_id', Task::TABLE)
->asc(Link::TABLE.'.id')
->desc(Board::TABLE.'.position')
->desc(Task::TABLE.'.is_active')
diff --git a/app/Template/tasklink/show.php b/app/Template/tasklink/show.php
index 7125b11d..97a3a767 100644
--- a/app/Template/tasklink/show.php
+++ b/app/Template/tasklink/show.php
@@ -6,6 +6,7 @@
<tr>
<th class="column-20"><?= t('Label') ?></th>
<th class="column-30"><?= t('Task') ?></th>
+ <th class="column-20"><?= t('Project') ?></th>
<th><?= t('Column') ?></th>
<th><?= t('Assignee') ?></th>
<?php if (! isset($not_editable)): ?>
@@ -52,6 +53,7 @@
<strong><?= $this->e($link['task_time_estimated']).'h' ?></strong> <?= t('estimated') ?>
<?php endif ?>
</td>
+ <td><?= $this->e($link['project_name']) ?></td>
<td><?= $this->e($link['column_title']) ?></td>
<td>
<?php if (! empty($link['task_assignee_username'])): ?>