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

* Fix bug #30845.

Browse Source
This commit is contained in:
liuhong
2022-12-15 02:17:42 +00:00
parent 4a718900d2
commit 0dc5fbdb33
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/build/control.php
View File

@@ -876,9 +876,10 @@ class build extends control
}
else
{
$branchList = $this->loadModel('branch')->getPairs($build->product, '', $build->execution);
$branchAll = sprintf($this->lang->build->branchAll, $this->lang->product->branchName[$product->type]);
$branches = array('' => $branchAll, BRANCH_MAIN => $this->lang->branch->main);
$buildBranch = array();
$branchList = $this->loadModel('branch')->getPairs($build->product, '', $build->execution);
$branchAll = sprintf($this->lang->build->branchAll, $this->lang->product->branchName[$product->type]);
$branches = array('' => $branchAll, BRANCH_MAIN => $this->lang->branch->main);
if(strpos($build->branch, ',') !== false) $buildBranch = explode(',', $build->branch);
foreach($buildBranch as $buildKey) $branches += array($buildKey => zget($branchList, $buildKey));