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

Do not show inactive projects info on the dashboard and update picodb (merge #546)

Browse Source
This commit is contained in:
Frederic Guillot
2015-01-25 11:55:12 -05:00
parent 655d75a3cf
commit e506648cbc
12 changed files with 50 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Model/Swimlane.php
View File

@@ -171,7 +171,7 @@ class Swimlane extends Base
$swimlanes = array_merge(
$swimlanes,
$this->db->table(self::TABLE)->eq('project_id', $project_id)->orderBy('name', 'asc')->listing('id', 'name')
$this->db->hashtable(self::TABLE)->eq('project_id', $project_id)->orderBy('name', 'asc')->getAll('id', 'name')
);
return $prepend ? array(-1 => t('All swimlanes')) + $swimlanes : $swimlanes;
@@ -354,11 +354,11 @@ class Swimlane extends Base
*/
public function moveDown($project_id, $swimlane_id)
{
$swimlanes = $this->db->table(self::TABLE)
$swimlanes = $this->db->hashtable(self::TABLE)
->eq('project_id', $project_id)
->eq('is_active', self::ACTIVE)
->asc('position')
->listing('id', 'position');
->getAll('id', 'position');
$positions = array_flip($swimlanes);
@@ -388,11 +388,11 @@ class Swimlane extends Base
*/
public function moveUp($project_id, $swimlane_id)
{
$swimlanes = $this->db->table(self::TABLE)
$swimlanes = $this->db->hashtable(self::TABLE)
->eq('project_id', $project_id)
->eq('is_active', self::ACTIVE)
->asc('position')
->listing('id', 'position');
->getAll('id', 'position');
$positions = array_flip($swimlanes);