Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/tianshujie_25205' into 'master'

Browse Source 
* Fix bug #25205.

See merge request easycorp/zentaopms!4536
This commit is contained in:
孙广明
2022-07-14 02:39:28 +00:00
parent f2a76aad04 da9666247b
commit 4cdb77e983
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+4 -3
View File
@@ -235,13 +235,14 @@ 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->spacePairs = $spacePairs;
$this->view->type = $type;
$this->view->typeList = $this->lang->kanbanspace->featureBar;
$this->view->kanbans = array('' => '') + $this->kanban->getPairs();