diff options
| author | Busfreak <Busfreak@users.noreply.github.com> | 2017-02-16 02:31:32 +0100 |
|---|---|---|
| committer | Frédéric Guillot <fred@kanboard.net> | 2017-02-15 20:31:32 -0500 |
| commit | d6d1df291713b8bad114c70905dc9adad9e5dcbe (patch) | |
| tree | 577db156370a5b3395084be555954d5b1c6638ef | |
| parent | ce3cab5374864449268c02b3470abbc831ff7c41 (diff) | |
Sub-tasks from the hidden columns still visible on the dashboard (#3040)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | app/Model/SubtaskModel.php | 2 |
2 files changed, 6 insertions, 0 deletions
@@ -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 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')); } |