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

* fix bug #3439.

Browse Source
This commit is contained in:
z
2020-09-04 09:13:31 +08:00
parent 0244080f1a
commit f2b95366f9
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+8 -1
View File
@@ -1920,7 +1920,6 @@ class project extends control
$this->loadModel('dept');
$project = $this->project->getById($projectID);
$users = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback', '', $this->config->maxCount);
$roles = $this->user->getUserRoles(array_keys($users));
$deptUsers = $dept === '' ? array() : $this->dept->getDeptUserPairs($dept);
$currentMembers = $this->project->getTeamMembers($projectID);
@@ -1928,6 +1927,14 @@ class project extends control
$teams2Import = $this->project->getTeams2Import($this->app->user->account, $projectID);
$teams2Import = array('' => '') + $teams2Import;
/* Append users for get users. */
$appendUsers = array();
foreach($currentMembers as $member) $appendUsers[$member->account] = $member->account;
foreach($members2Import as $member) $appendUsers[$member->account] = $member->account;
foreach($deptUsers as $deptAccount => $userName) $appendUsers[$deptAccount] = $deptAccount;
$users = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback', $appendUsers, $this->config->maxCount);
/* Set menu. */
$this->project->setMenu($this->projects, $project->id);
if(!empty($this->config->user->moreLink)) $this->config->moreLinks["accounts[]"] = $this->config->user->moreLink;