From d6d1df291713b8bad114c70905dc9adad9e5dcbe Mon Sep 17 00:00:00 2001 From: Busfreak Date: Thu, 16 Feb 2017 02:31:32 +0100 Subject: Sub-tasks from the hidden columns still visible on the dashboard (#3040) --- app/Model/SubtaskModel.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app') diff --git a/app/Model/SubtaskModel.php b/app/Model/SubtaskModel.php index 737a933d..ca2c8488 100644 --- a/app/Model/SubtaskModel.php +++ b/app/Model/SubtaskModel.php @@ -90,9 +90,11 @@ class SubtaskModel extends Base ->subquery($this->subtaskTimeTrackingModel->getTimerQuery($user_id), 'timer_start_date') ->eq('user_id', $user_id) ->eq(ProjectModel::TABLE.'.is_active', ProjectModel::ACTIVE) + ->eq(ColumnModel::TABLE.'.hide_in_dashboard', 0) ->in(SubtaskModel::TABLE.'.status', $status) ->join(TaskModel::TABLE, 'id', 'task_id') ->join(ProjectModel::TABLE, 'id', 'project_id', TaskModel::TABLE) + ->join(ColumnModel::TABLE, 'id', 'column_id', TaskModel::TABLE) ->callback(array($this, 'addStatusName')); } -- cgit v1.2.3