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

* finish task #2543.

Browse Source 
* adjust method name createGroupLink to createGroupManageMemberLink.
This commit is contained in:
chenfeiCF
2016-03-25 17:27:08 +08:00
parent 902963c8f6
commit 8d843914d4
4 changed files with 78 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+9 -9
View File
@@ -1367,7 +1367,7 @@ class project extends control
* @access public
* @return void
*/
public function manageMembers($projectID = 0, $team2Import = 0)
public function manageMembers($projectID = 0, $team2Import = 0, $deptID = 0)
{
if(!empty($_POST))
{
@@ -1375,22 +1375,20 @@ class project extends control
$this->locate($this->createLink('project', 'team', "projectID=$projectID"));
exit;
}
/* Load model. */
$this->loadModel('user');
$this->loadModel('dept');
$project = $this->project->getById($projectID);
$users = $this->user->getPairs('noclosed, nodeleted, devfirst');
$roles = $this->user->getUserRoles(array_keys($users));
$allUsers = $this->user->getPairs('noclosed, nodeleted, devfirst');
$roles = $this->user->getUserRoles(array_keys($allUsers));
$currentMembers = $this->project->getTeamMembers($projectID);
$members2Import = $this->project->getMembers2Import($team2Import, array_keys($currentMembers));
$users = $this->dept->getDeptUserPairs($deptID, 'devfirst');
$teams2Import = $this->project->getTeams2Import($this->app->user->account, $projectID);
$teams2Import = array($this->lang->project->copyTeam) + $teams2Import;
/* The deleted members. */
foreach($currentMembers as $account => $member)
{
if(!isset($users[$member->account])) $member->account .= $this->lang->user->deleted;
}
/* Set menu. */
$this->project->setMenu($this->projects, $project->id);
@@ -1402,7 +1400,9 @@ class project extends control
$this->view->position = $position;
$this->view->project = $project;
$this->view->users = $users;
$this->view->allUsers = $allUsers;
$this->view->roles = $roles;
$this->view->deptTree = $this->dept->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createPrjManageMemberLink'), array('projectID' => $projectID, 'team2Import' => $team2Import));
$this->view->currentMembers = $currentMembers;
$this->view->members2Import = $members2Import;
$this->view->teams2Import = $teams2Import;