From d6d1df291713b8bad114c70905dc9adad9e5dcbe Mon Sep 17 00:00:00 2001
From: Busfreak <Busfreak@users.noreply.github.com>
Date: Thu, 16 Feb 2017 02:31:32 +0100
Subject: [PATCH] Sub-tasks from the hidden columns still visible on the
 dashboard (#3040)

---
 ChangeLog                  | 4 ++++
 app/Model/SubtaskModel.php | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5716264d5..0a331ebda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ Improvements:
 
 * Use contextual menu instead of action column in users management
 
+Bug fixes:
+
+* Hiding subtasks from hidden tasks in dashboard
+
 Version 1.0.39 (Feb 12, 2017)
 -----------------------------
 
diff --git a/app/Model/SubtaskModel.php b/app/Model/SubtaskModel.php
index 737a933d9..ca2c8488a 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'));
     }