Fix bug links with different columns (pull-request merge)

3 files changed, 4 insertions, 3 deletions

diff --git a/app/Model/TaskLink.php b/app/Model/TaskLink.php
index 85ad2737..f8e9f99e 100644
--- a/app/Model/TaskLink.php
+++ b/app/Model/TaskLink.php
@@ -51,11 +51,12 @@ class TaskLink extends Base
                         Task::TABLE.'.title',
                         Task::TABLE.'.is_active',
                         Task::TABLE.'.project_id',
-                        Task::TABLE.'.column_id'
+                        Board::TABLE.'.title AS column_title'
                     )
                     ->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)
                     ->findAll();
     }
 
diff --git a/app/Template/task/show.php b/app/Template/task/show.php
index 60243537..1ff2ef43 100644
--- a/app/Template/task/show.php
+++ b/app/Template/task/show.php
@@ -1,7 +1,7 @@
 <?= $this->render('task/details', array('task' => $task, 'project' => $project)) ?>
 <?= $this->render('task/time', array('task' => $task, 'values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?>
 <?= $this->render('task/show_description', array('task' => $task)) ?>
-<?= $this->render('tasklink/show', array('task' => $task, 'links' => $links, 'columns_list' => $columns_list)) ?>
+<?= $this->render('tasklink/show', array('task' => $task, 'links' => $links)) ?>
 <?= $this->render('subtask/show', array('task' => $task, 'subtasks' => $subtasks)) ?>
 <?= $this->render('task/timesheet', array('task' => $task)) ?>
 <?= $this->render('file/show', array('task' => $task, 'files' => $files)) ?>
diff --git a/app/Template/tasklink/show.php b/app/Template/tasklink/show.php
index f759be5e..f0a70054 100644
--- a/app/Template/tasklink/show.php
+++ b/app/Template/tasklink/show.php
@@ -23,7 +23,7 @@
                     $link['is_active'] ? '' : 'task-link-closed'
                 ) ?>
             </td>
-            <td><?= $columns_list[$link['column_id']] ?></td>
+            <td><?= $this->e($link['column_title']) ?></td>
             <td>
                 <?= $this->a(t('Remove'), 'tasklink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
             </td>