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

Merge branch 'master_xieqiyu_79662' into 'master'

Browse Source 
* Code for task#79662.

See merge request easycorp/zentaopms!6548
This commit is contained in:
孙广明
2022-12-14 06:14:08 +00:00
parent 5b48a564f0 fc17dfc949
commit 8d8696b1e4
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/control.php
+1 -1
View File
@@ -180,7 +180,7 @@ class build extends control
{
$productGroups = $this->product->getProducts($build->project);
$branches = $this->loadModel('branch')->getList($build->product, $build->project, 'all');
$builds = $this->build->getBuildPairs($build->product, $build->branch, 'noempty,notrunk,singled,separate', $build->project, 'project', $build->builds, false);
$builds = $this->build->getBuildPairs($build->product, 'all', 'noempty,notrunk,singled,separate', $build->project, 'project', $build->builds, false);
}
$executions = $this->product->getExecutionPairsByProduct($build->product, $build->branch, 'id_desc', $this->session->project, 'stagefilter');
module/build/model.php
+40
View File
@@ -456,6 +456,46 @@ class buildModel extends model
->remove('allchecker,resolvedBy,files,labels,uid')
->get();
if(empty($oldBuild->execution))
{
$buildBranch = array();
foreach(explode(',', trim($build->branch, ',')) as $branchID) $buildBranch[$branchID] = $branchID;
/* Get delete builds. */
$deleteBuilds = array();
foreach(explode(',', $oldBuild->builds) as $oldBuildID)
{
if(empty($oldBuildID)) continue;
if(strpos(",$newBuilds,", ",$oldBuildID,") === false) $deleteBuilds[$oldBuildID] = $oldBuildID;
}
/* Delete the branch when the branch of the deleted build has no linked stories. */
$deleteBuildBranches = $this->dao->select('branch')->from(TABLE_BUILD)->where('id')->in($deleteBuilds)->fetchPairs();
$linkedStoryBranches = $this->dao->select('branch')->from(TABLE_STORY)->where('id')->in($oldBuild->stories)->fetchPairs('branch');
foreach($deleteBuildBranches as $deleteBuildBranch)
{
foreach(explode(',', $deleteBuildBranch) as $deleteBuildBranchID)
{
if(empty($deleteBuildBranchID) or isset($linkedStoryBranches[$deleteBuildBranchID])) continue;
unset($buildBranch[$deleteBuildBranchID]);
}
}
/* Add branch of new builds. */
$newBuilds = isset($build->builds) ? $build->builds : '';
$newBuildBranches = $this->dao->select('branch')->from(TABLE_BUILD)->where('id')->in($newBuilds)->fetchPairs();
foreach($newBuildBranches as $newBuildBranch)
{
foreach(explode(',', $newBuildBranch) as $newBuildBranchID)
{
if(empty($newBuildBranchID)) continue;
if(!isset($buildBranch[$newBuildBranchID])) $buildBranch[$newBuildBranchID] = $newBuildBranchID;
}
}
$build->branch = implode(',', $buildBranch);
}
$product = $this->loadModel('product')->getByID($build->product);
if(!empty($product) and $product->type != 'normal' and !isset($_POST['branch']) and isset($_POST['product']))
{