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

Show swimlane dropdown only when necessary

Browse Source
This commit is contained in:
Frederic Guillot
2015-05-21 22:28:28 -04:00
parent 0a9b6f0d99
commit c9ba525bab
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Model/Swimlane.php
View File

@@ -189,9 +189,10 @@ class Swimlane extends Base
* @access public
* @param integer $project_id Project id
* @param boolean $prepend Prepend default value
* @param boolean $only_active Return only active swimlanes
* @return array
*/
public function getList($project_id, $prepend = false)
public function getList($project_id, $prepend = false, $only_active = false)
{
$swimlanes = array();
$default = $this->db->table(Project::TABLE)->eq('id', $project_id)->eq('show_default_swimlane', 1)->findOneColumn('default_swimlane');
@@ -204,7 +205,11 @@ class Swimlane extends Base
$swimlanes[0] = $default === 'Default swimlane' ? t($default) : $default;
}
return $swimlanes + $this->db->hashtable(self::TABLE)->eq('project_id', $project_id)->orderBy('position', 'asc')->getAll('id', 'name');
return $swimlanes + $this->db->hashtable(self::TABLE)
->eq('project_id', $project_id)
->in('is_active', $only_active ? array(self::ACTIVE) : array(self::ACTIVE, self::INACTIVE))
->orderBy('position', 'asc')
->getAll('id', 'name');
}
/**