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

Hide tasks within specific columns in dashboard (#2424)

Browse Source
This commit is contained in:
Busfreak
2016-07-05 17:09:13 +02:00
committed by Frédéric Guillot
parent b215296f97
commit 6ccd8c11fa
36 changed files with 66 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Model/ColumnModel.php
View File

@@ -144,13 +144,14 @@ class ColumnModel extends Base
* @param string $description Column description
* @return boolean|integer
*/
public function create($project_id, $title, $task_limit = 0, $description = '')
public function create($project_id, $title, $task_limit = 0, $description = '', $hide_in_dashboard = 0)
{
$values = array(
'project_id' => $project_id,
'title' => $title,
'task_limit' => intval($task_limit),
'position' => $this->getLastColumnPosition($project_id) + 1,
'hide_in_dashboard' => $hide_in_dashboard,
'description' => $description,
);
@@ -167,11 +168,12 @@ class ColumnModel extends Base
* @param string $description Optional description
* @return boolean
*/
public function update($column_id, $title, $task_limit = 0, $description = '')
public function update($column_id, $title, $task_limit = 0, $description = '', $hide_in_dashboard = 0)
{
return $this->db->table(self::TABLE)->eq('id', $column_id)->update(array(
'title' => $title,
'task_limit' => intval($task_limit),
'hide_in_dashboard' => $hide_in_dashboard,
'description' => $description,
));
}

3
app/Model/TaskFinderModel.php
View File

@@ -81,7 +81,8 @@ class TaskFinderModel extends Base
->join(ColumnModel::TABLE, 'id', 'column_id')
->eq(TaskModel::TABLE.'.owner_id', $user_id)
->eq(TaskModel::TABLE.'.is_active', TaskModel::STATUS_OPEN)
->eq(ProjectModel::TABLE.'.is_active', ProjectModel::ACTIVE);
->eq(ProjectModel::TABLE.'.is_active', ProjectModel::ACTIVE)
->eq(ColumnModel::TABLE.'.hide_in_dashboard', 0);
}
/**