AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sub-tasks from the hidden columns still visible on the dashboard (#3040)

Browse Source
This commit is contained in:
Busfreak
2017-02-16 02:31:32 +01:00
committed by Frédéric Guillot
parent ce3cab5374
commit d6d1df2917
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ Improvements:
* Use contextual menu instead of action column in users management * 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) Version 1.0.39 (Feb 12, 2017)
----------------------------- -----------------------------

2
app/Model/SubtaskModel.php
View File

@@ -90,9 +90,11 @@ class SubtaskModel extends Base
->subquery($this->subtaskTimeTrackingModel->getTimerQuery($user_id), 'timer_start_date') ->subquery($this->subtaskTimeTrackingModel->getTimerQuery($user_id), 'timer_start_date')
->eq('user_id', $user_id) ->eq('user_id', $user_id)
->eq(ProjectModel::TABLE.'.is_active', ProjectModel::ACTIVE) ->eq(ProjectModel::TABLE.'.is_active', ProjectModel::ACTIVE)
->eq(ColumnModel::TABLE.'.hide_in_dashboard', 0)
->in(SubtaskModel::TABLE.'.status', $status) ->in(SubtaskModel::TABLE.'.status', $status)
->join(TaskModel::TABLE, 'id', 'task_id') ->join(TaskModel::TABLE, 'id', 'task_id')
->join(ProjectModel::TABLE, 'id', 'project_id', TaskModel::TABLE) ->join(ProjectModel::TABLE, 'id', 'project_id', TaskModel::TABLE)
->join(ColumnModel::TABLE, 'id', 'column_id', TaskModel::TABLE)
->callback(array($this, 'addStatusName')); ->callback(array($this, 'addStatusName'));
} }