diff --git a/module/kanban/control.php b/module/kanban/control.php index 3bdfa62371..e27a6d0478 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -1672,7 +1672,7 @@ class kanban extends control public function ajaxGetKanbanMenu($kanbanID, $moduleName, $methodName) { $kanbanIdList = $this->kanban->getCanViewObjects(); - $spacePairs = $this->kanban->getSpacePairs('all'); + $spacePairs = $this->kanban->getSpacePairs('showClosed'); $this->view->kanbanList = $this->dao->select('*')->from(TABLE_KANBAN) ->where('deleted')->eq('0') diff --git a/module/kanban/model.php b/module/kanban/model.php index c2b0349425..bdd0e408ea 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1634,7 +1634,7 @@ class kanbanModel extends model ->where('deleted')->eq(0) ->beginIF(in_array($browseType, array('private', 'cooperation', 'public')))->andWhere('type')->eq($browseType)->fi() ->beginIF($browseType == 'involved')->andWhere('owner')->ne($account)->fi() - ->beginIF($this->cookie->showClosed == 0)->andWhere('status')->ne('closed')->fi() + ->beginIF($this->cookie->showClosed == 0 and $browseType != 'showClosed')->andWhere('status')->ne('closed')->fi() ->beginIF(!$this->app->user->admin)->andWhere('id')->in($spaceIdList)->fi() ->orderBy('id_desc') ->fetchPairs('id'); @@ -2036,7 +2036,7 @@ class kanbanModel extends model $lane->type = $type; $lane->execution = $executionID; $this->dao->insert(TABLE_KANBANLANE)->data($lane)->exec(); - + $laneID = $this->dao->lastInsertId(); $this->createExecutionColumns($laneID, $type, $executionID); }