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
+13 -4
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();
}
@@ -1449,7 +1458,7 @@ class kanban extends control
$this->display();
}
/**
* Set archived.
*