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

* Code for bug#31949.

Browse Source
This commit is contained in:
xieqiyu
2023-02-08 08:37:38 +08:00
parent 1bd84b68c7
commit bfe1a0ef5e
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/model.php
+30 -2
View File
@@ -741,7 +741,7 @@ class programplanModel extends model
}
$project = $this->loadModel('project')->getByID($projectID);
$productList = $this->loadModel('product')->getProductPairsByProject($projectID);
$productList = $this->loadModel('product')->getProducts($projectID);
$totalPercent = 0;
$totalDevType = 0;
@@ -873,6 +873,22 @@ class programplanModel extends model
if($data->acl != 'open') $this->user->updateUserView($stageID, 'sprint');
$linkProducts = array();
$linkBranches = array();
if($project->division)
{
$linkProducts = array(0 => $productID);
$linkBranches = array(0 => $productList[$productID]->branches);
}
else
{
$linkProducts = array_keys($productList);
foreach($linkProducts as $index => $productID) $linkBranches[$index] = $productList[$productID]->branches;
}
$this->post->set('products', $linkProducts);
$this->post->set('branch', $linkBranches);
$this->execution->updateProducts($stageID);
/* Record version change information. */
if($planChanged)
{
@@ -949,8 +965,20 @@ class programplanModel extends model
$this->setTreePath($stageID);
if($data->acl != 'open') $this->user->updateUserView($stageID, 'sprint');
$linkProducts = $project->division ? array(0 => $productID) : array_keys($productList);
$linkProducts = array();
$linkBranches = array();
if($project->division)
{
$linkProducts = array(0 => $productID);
$linkBranches = array(0 => $productList[$productID]->branches);
}
else
{
$linkProducts = array_keys($productList);
foreach($linkProducts as $index => $productID) $linkBranches[$index] = $productList[$productID]->branches;
}
$this->post->set('products', $linkProducts);
$this->post->set('branch', $linkBranches);
$this->execution->updateProducts($stageID);
/* Record version change information. */