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

2015-02-21 14:24:00 -05:00
parent 651528d705
commit 5f1dcf1ae8
3 changed files with 4 additions and 3 deletions
--- 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();
    }