diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-02-21 14:24:00 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-02-21 14:24:00 -0500 |
| commit | 5f1dcf1ae8a978c996455824dc80bf77853f70c6 (patch) | |
| tree | 0cd7d3e51882e8d9ae56a00afed498647d090781 /app/Model | |
| parent | 651528d705ba8d6f4f5e13bb292e460e9e992f89 (diff) | |
Fix bug links with different columns (pull-request merge)
Diffstat (limited to 'app/Model')
| -rw-r--r-- | app/Model/TaskLink.php | 3 |
1 files changed, 2 insertions, 1 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(); } |