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

* [bug#54933,done,0.8h] Hints are given only when the removed members are also in the execution team.

Browse Source
This commit is contained in:
hufangzhou
2024-09-05 15:26:58 +08:00
committed by 王于听
parent e303656cd5
commit 6acb8d7b80
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+22 -13
View File
@@ -1148,23 +1148,32 @@ class project extends control
return $this->send(array('message' => $this->lang->saveSuccess, 'result' => 'success', 'load' => $this->createLink('project', 'team', "projectID=$projectID")));
}
$users = $this->user->getPairs('noclosed|nodeleted|devfirst');
$roles = $this->user->getUserRoles(array_keys($users));
$deptUsers = $dept === '' ? array() : $this->dept->getDeptUserPairs((int)$dept);
$users = $this->user->getPairs('noclosed|nodeleted|devfirst');
$roles = $this->user->getUserRoles(array_keys($users));
$deptUsers = $dept === '' ? array() : $this->dept->getDeptUserPairs((int)$dept);
$executions = $this->project->getExecutionList(array($projectID));
$executionTeams = $this->execution->getMembersByIdList(array_keys($executions));
$executionMembers = array();
foreach($executionTeams as $executionID => $executionTeam)
{
$executionMembers += array_keys($executionTeam);
}
$currentMembers = $this->project->getTeamMembers($projectID);
$members2Import = $this->project->getMembers2Import($copyProjectID, array_keys($currentMembers));
$this->view->title = $this->lang->project->manageMembers . $this->lang->hyphen . $project->name;
$this->view->project = $project;
$this->view->users = $users;
$this->view->roles = $roles;
$this->view->dept = $dept;
$this->view->depts = $this->dept->getOptionMenu();
$this->view->teams2Import = $this->loadModel('personnel')->getCopiedObjects($projectID, 'project', true);
$this->view->currentMembers = $currentMembers;
$this->view->copyProjectID = $copyProjectID;
$this->view->teamMembers = $this->projectZen->buildMembers($currentMembers, $members2Import, $deptUsers, $project->days);
$this->view->title = $this->lang->project->manageMembers . $this->lang->hyphen . $project->name;
$this->view->project = $project;
$this->view->users = $users;
$this->view->roles = $roles;
$this->view->dept = $dept;
$this->view->depts = $this->dept->getOptionMenu();
$this->view->teams2Import = $this->loadModel('personnel')->getCopiedObjects($projectID, 'project', true);
$this->view->currentMembers = $currentMembers;
$this->view->copyProjectID = $copyProjectID;
$this->view->teamMembers = $this->projectZen->buildMembers($currentMembers, $members2Import, $deptUsers, $project->days);
$this->view->executionMembers = $executionMembers;
$this->display();
}