Merge branch 'zentaopms_252'

This commit is contained in:
wangyidong
2022-11-08 09:23:23 +08:00
47 changed files with 453 additions and 90 deletions
+5 -1
View File
@@ -739,6 +739,8 @@ class programplanModel extends model
$datas[] = $plan;
}
$project = $this->loadModel('project')->getByID($projectID);
$productList = $this->loadModel('product')->getProductPairsByProject($projectID);
$totalPercent = 0;
$totalDevType = 0;
@@ -891,6 +893,7 @@ class programplanModel extends model
{
unset($data->id);
$data->status = 'wait';
$data->division = $project->division;
$data->version = 1;
$data->parentVersion = $data->parent == 0 ? 0 : $this->dao->findByID($data->parent)->from(TABLE_PROJECT)->fetch('version');
$data->team = substr($data->name,0, 30);
@@ -945,7 +948,8 @@ class programplanModel extends model
$this->setTreePath($stageID);
if($data->acl != 'open') $this->user->updateUserView($stageID, 'sprint');
$this->post->set('products', array(0 => $productID));
$linkProducts = $project->division ? array(0 => $productID) : array_keys($productList);
$this->post->set('products', $linkProducts);
$this->execution->updateProducts($stageID);
/* Record version change information. */