This commit is contained in:
tianshujie
2024-04-10 13:49:22 +08:00
parent a85f2e8b5f
commit 2c0ff00c07
2 changed files with 8 additions and 2 deletions
+6
View File
@@ -5993,6 +5993,12 @@ class executionModel extends model
$_POST['hasProduct'] = $project->hasProduct;
if($project->code) $_POST['code'] = $project->code;
if($project->model == 'kanban')
{
$teamMembers = $this->dao->select('*')->from(TABLE_TEAM)->where('type')->eq('project')->andWhere('root')->eq($projectID)->fetchPairs('account', 'account');
$_POST['teamMembers'] = array_values($teamMembers);
}
$projectProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchAll();
foreach($projectProducts as $projectProduct)
{
+2 -2
View File
@@ -1518,7 +1518,7 @@ class projectModel extends model
if($project->acl != 'open') $this->loadModel('user')->updateUserView($projectID, 'project');
if(empty($project->multiple) and $project->model != 'waterfall' and $project->model != 'waterfallplus') $this->loadModel('execution')->createDefaultSprint($projectID);
if(empty($project->multiple) && !in_array($project->model, array('waterfall', 'waterfallplus'))) $this->loadModel('execution')->createDefaultSprint($projectID);
return $projectID;
}
@@ -1711,7 +1711,7 @@ class projectModel extends model
if($project->status == 'closed') $this->product->close($productID);
}
if(empty($oldProject->multiple) and $oldProject->model != 'waterfall') $this->loadModel('execution')->syncNoMultipleSprint($projectID);
if(empty($project->multiple) && !in_array($oldProject->model, array('waterfall', 'waterfallplus'))) $this->loadModel('execution')->syncNoMultipleSprint($projectID);
return common::createChanges($oldProject, $project);
}