diff options
| author | Max Kamashev <kamashev@gollard.ru> | 2015-09-30 09:19:33 +0300 |
|---|---|---|
| committer | Max Kamashev <kamashev@gollard.ru> | 2015-09-30 09:19:33 +0300 |
| commit | cabcdc9d9e58d279ac6a5992ae5202568ed4d24e (patch) | |
| tree | eebdc4ec16eb7dc2ed0edd953321fa3e02869f34 /app/Model/TaskLink.php | |
| parent | 930406bf70e42413a83114b9530b3f63ccf9419f (diff) | |
| parent | 421e8751ebca5b566ecbd8d08e9d56b93ce81ffa (diff) | |
Merge branch 'master' of https://github.com/fguillot/kanboard into 1245_bug_with_subtask_timer
Diffstat (limited to 'app/Model/TaskLink.php')
| -rw-r--r-- | app/Model/TaskLink.php | 4 |
1 files changed, 3 insertions, 1 deletions
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') |