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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
王怡栋
2022-03-23 17:28:59 +08:00
parent 2f0f2e2965 85c0bedc77
commit 7c8dcef938
2 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/model.php
+39 -11
View File
@@ -540,6 +540,25 @@ class programplanModel extends model
->where('id')->eq($stageID)
->exec();
/* Add PM to stage teams and project teams. */
if(!empty($data->PM))
{
$team = $this->user->getTeamMemberPairs($stageID, 'execution');
if(isset($team[$data->PM])) continue;
$roles = $this->user->getUserRoles($data->PM);
$member = new stdclass();
$member->root = $stageID;
$member->account = $data->PM;
$member->role = zget($roles, $data->PM, '');
$member->join = $now;
$member->type = 'execution';
$member->days = $data->days;
$member->hours = $this->config->execution->defaultWorkhours;
$this->dao->insert(TABLE_TEAM)->data($member)->exec();
$this->execution->addProjectMembers($data->project, array($data->PM => $member));
}
if($data->acl != 'open') $this->user->updateUserView($stageID, 'sprint');
/* Record version change information. */
@@ -592,17 +611,26 @@ class programplanModel extends model
$lib->acl = 'default';
$this->dao->insert(TABLE_DOCLIB)->data($lib)->exec();
/* Add creators to stage teams and execution teams. */
$member = new stdclass();
$member->root = $stageID;
$member->account = $account;
$member->role = $this->lang->user->roleList[$this->app->user->role];
$member->join = $now;
$member->type = 'execution';
$member->days = $data->days;
$member->hours = $this->config->execution->defaultWorkhours;
$this->dao->insert(TABLE_TEAM)->data($member)->exec();
$this->execution->addProjectMembers($data->project, array($member));
/* Add creators and PM to stage teams and project teams. */
$teamMembers = array();
$members = array($account, $data->PM);
$roles = $this->user->getUserRoles(array_values($members));
foreach($members as $account)
{
if(empty($account)) continue;
$member = new stdclass();
$member->root = $stageID;
$member->account = $account;
$member->role = zget($roles, $account, '');
$member->join = $now;
$member->type = 'execution';
$member->days = $data->days;
$member->hours = $this->config->execution->defaultWorkhours;
$this->dao->insert(TABLE_TEAM)->data($member)->exec();
$teamMembers[$account] = $member;
}
$this->execution->addProjectMembers($data->project, $teamMembers);
$this->setTreePath($stageID);
if($data->acl != 'open') $this->user->updateUserView($stageID, 'sprint');
module/project/model.php
+1 -1
View File
@@ -1542,7 +1542,7 @@ class projectModel extends model
{
if(empty($account)) continue;
if((int)$days[$key] > $project->days)
if(!empty($project->days) and (int)$days[$key] > $project->days)
{
dao::$errors['message'][] = sprintf($this->lang->project->daysGreaterProject, $project->days);
return false;