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

* Finish task 44503.

Browse Source
This commit is contained in:
wangjianhua
2021-11-17 09:59:16 +00:00
parent f0ee430add
commit 4fd69c6661
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/model.php
+7 -2
View File
@@ -288,7 +288,8 @@ class buildModel extends model
{
if(empty($build->releaseID) and (strpos($params, 'nodone') !== false) and ($build->executionStatus === 'done')) continue;
if((strpos($params, 'noterminate') !== false) and ($build->releaseStatus === 'terminate')) continue;
$builds[$key] = ((strpos($params, 'withbranch') !== false and $build->branchName) ? $build->branchName . '/' : '') . $build->name;
$branchName = $build->branchName ? $build->branchName : $this->lang->branch->main;
$builds[$key] = (strpos($params, 'withbranch') !== false ? $branchName . '/' : '') . $build->name;
}
if(!$builds) return $sysBuilds;
@@ -302,7 +303,11 @@ class buildModel extends model
->beginIF($branch)->andWhere('branch')->in("0,$branch")->fi()
->andWhere('deleted')->eq(0)
->fetchPairs();
foreach($releases as $buildID => $releaseName) $builds[$buildID] = ((strpos($params, 'withbranch') !== false and $productBuilds[$buildID]->branchName) ? $productBuilds[$buildID]->branchName . '/' : '') . $releaseName;
foreach($releases as $buildID => $releaseName)
{
$branchName = $productBuilds[$buildID]->branchName ? $productBuilds[$buildID]->branchName : $this->lang->branch->main;
$builds[$buildID] = (strpos($params, 'withbranch') !== false ? $branchName . '/' : '') . $releaseName;
}
}
return $sysBuilds + $builds;