From 2aa28a01d63ca1c58cd3aff0a84bbfcbeb871f1f Mon Sep 17 00:00:00 2001
From: "xavier.vidal" <xavier.vidal@MAC-0614-002.local>
Date: Fri, 25 Sep 2015 17:16:34 +0200
Subject: Show project name in task links

---
 app/Model/TaskLink.php         | 4 +++-
 app/Template/tasklink/show.php | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'app')

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'])): ?>
-- 
cgit v1.2.3