diff --git a/module/kanban/control.php b/module/kanban/control.php index 6ecee5ccd7..daaa210ea3 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -161,7 +161,7 @@ class kanban extends control $this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted'); $this->view->spaceID = $spaceID; - $this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs(); + $this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs('noclosed'); $this->display(); } @@ -189,7 +189,7 @@ class kanban extends control } $this->view->users = $this->loadModel('user')->getPairs('noclosed'); - $this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs(); + $this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs('noclosed'); $this->view->kanban = $this->kanban->getByID($kanbanID); $this->display(); diff --git a/module/kanban/model.php b/module/kanban/model.php index d8cfd7956f..82bd9d5bb8 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -859,6 +859,7 @@ class kanbanModel extends model ->beginIF($browseType == 'my')->andWhere('owner')->eq($account)->fi() ->beginIF($browseType == 'other')->andWhere('owner')->ne($account)->fi() ->beginIF($browseType == 'closed')->andWhere('status')->eq('closed')->fi() + ->beginIF($browseType == 'noclosed')->andWhere('status')->ne('closed')->fi() ->beginIF(!$this->app->user->admin)->andWhere('id')->in($spaceIdList)->fi() ->orderBy('id_desc') ->fetchPairs('id');