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

* Fix bug #15516.

Browse Source
This commit is contained in:
tianshujie
2021-10-14 10:47:07 +08:00
parent 6e94ad01de
commit 264a20d583
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/control.php
+7 -2
View File
@@ -350,17 +350,22 @@ class upgrade extends control
if(dao::isError()) die(js::error(dao::getError()));
/* Process merged independent projects. */
$productIdList = array();
if($type == 'noProject')
{
$productIdList = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->in($linkedSprints)->fetchPairs();
}
if($_POST['projectType'] == 'execution')
{
/* Use historical projects as execution upgrades. */
$this->upgrade->processMergedData($programID, $projectList, $lineID, array(), $linkedSprints);
$this->upgrade->processMergedData($programID, $projectList, $lineID, $productIdList, $linkedSprints);
}
else
{
/* Use historical projects as project upgrades. */
foreach($linkedSprints as $sprint)
{
$this->upgrade->processMergedData($programID, $projectList[$sprint], $lineID, array(), array($sprint => $sprint));
$this->upgrade->processMergedData($programID, $projectList[$sprint], $lineID, $productIdList, array($sprint => $sprint));
}
}
}