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

* Fix bug #18952, #18904.

Browse Source
This commit is contained in:
liumengyi
2022-01-25 14:41:27 +08:00
parent b6901081a7
commit 9667299ce4
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+12 -3
View File
@@ -744,7 +744,11 @@ class kanban extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
}
$this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted');
$kanban = $this->kanban->getById($kanbanID);
$kanbanUsers = $kanbanID == 0 ? ',' : trim($kanban->owner) . ',' . trim($kanban->team) . ',' . trim($kanban->whitelist);
$users = $this->loadModel('user')->getPairs('noclosed|nodeleted', '', 0, $kanbanUsers);
$this->view->users = $users;
$this->view->lanePairs = $this->kanban->getLanePairsByGroup($groupID);
$this->display();
@@ -805,9 +809,14 @@ class kanban extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
}
$this->view->card = $this->kanban->getCardByID($cardID);
$card = $this->kanban->getCardByID($cardID);
$kanban = $this->kanban->getById($card->kanban);
$kanbanUsers = $card->kanban == 0 ? ',' : trim($kanban->owner) . ',' . trim($kanban->team) . ',' . trim($kanban->whitelist);
$users = $this->loadModel('user')->getPairs('noclosed|nodeleted', '', 0, $kanbanUsers);
$this->view->card = $card;
$this->view->actions = $this->action->getList('kanbancard', $cardID);
$this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted');
$this->view->users = $users;
$this->display();
}
module/kanban/model.php
+2 -2
View File
@@ -1598,7 +1598,7 @@ class kanbanModel extends model
->beginIF($browseType == 'private' and !$this->app->user->admin)->andWhere('owner')->eq($account)->fi()
->beginIF($browseType == 'involved')->andWhere('owner')->ne($account)->fi()
->beginIF($this->cookie->showClosed == 0)->andWhere('status')->ne('closed')->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($spaceIdList)->fi()
->andWhere('id')->in($spaceIdList)
->orderBy('id_desc')
->page($pager)
->fetchAll('id');
@@ -1670,7 +1670,7 @@ class kanbanModel extends model
$spaceList = $objectType == 'kanban' ? $this->dao->select('id,owner,type')->from(TABLE_KANBANSPACE)->fetchAll('id') : array();
if($this->app->user->admin) return array_keys($objects);
if($this->app->user->admin and $param != 'involved') return array_keys($objects);
$account = $this->app->user->account;
foreach($objects as $objectID => $object)