From 5f1dcf1ae8a978c996455824dc80bf77853f70c6 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sat, 21 Feb 2015 14:24:00 -0500 Subject: Fix bug links with different columns (pull-request merge) --- app/Model/TaskLink.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/Model') 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(); } -- cgit v1.2.3