From 9bc172e1b8b55a2ee31e17a60906467b645714b2 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 14 Jul 2022 10:27:06 +0800 Subject: [PATCH 1/2] * Fix bug #25205. --- module/kanban/control.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module/kanban/control.php b/module/kanban/control.php index 27d7e1c65a..eceb0cb6e4 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -235,11 +235,12 @@ class kanban extends control $space = $this->kanban->getSpaceById($spaceID); $spaceUsers = $spaceID == 0 ? ',' : trim($space->owner) . ',' . trim($space->team); - $users = $this->loadModel('user')->getPairs('noclosed|nodeleted', '', 0, $spaceUsers); + $spacePairs = array(0 => '') + $this->kanban->getSpacePairs($type); + $users = isset($spacePairs[$spaceID]) ? $this->loadModel('user')->getPairs('noclosed|nodeleted', '', 0, $spaceUsers) : array(); $whitelist = (isset($space->whitelist) and !empty($space->whitelist)) ? $space->whitelist : ','; $this->view->users = $users; - $this->view->whitelist = $this->user->getPairs('noclosed|nodeleted', '', 0, $whitelist); + $this->view->whitelist = isset($spacePairs[$spaceID]) ? $this->user->getPairs('noclosed|nodeleted', '', 0, $whitelist) : array(); $this->view->spaceID = $spaceID; $this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs($type); $this->view->type = $type; From da9666247bf70d1cd3e612e1df1ef8224405258d Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 14 Jul 2022 10:38:19 +0800 Subject: [PATCH 2/2] * Fix bug #25205. --- module/kanban/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/kanban/control.php b/module/kanban/control.php index eceb0cb6e4..8e584869a0 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -242,7 +242,7 @@ class kanban extends control $this->view->users = $users; $this->view->whitelist = isset($spacePairs[$spaceID]) ? $this->user->getPairs('noclosed|nodeleted', '', 0, $whitelist) : array(); $this->view->spaceID = $spaceID; - $this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs($type); + $this->view->spacePairs = $spacePairs; $this->view->type = $type; $this->view->typeList = $this->lang->kanbanspace->featureBar; $this->view->kanbans = array('' => '') + $this->kanban->getPairs();