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

* Adjust code task #78665.

Browse Source
This commit is contained in:
liuhong
2022-12-08 14:40:21 +00:00
parent 3dd17f946c
commit 207c5c7117
7 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/build/control.php
View File

@@ -643,7 +643,7 @@ class build extends control
else
{
$branchPairs = $this->loadModel('branch')->getPairs($build->product, 'noempty');
$branchAll = $build->productType == 'branch' ? $this->lang->build->allBranch : $this->lang->build->allPlatform;
$branchAll = sprintf($this->lang->build->branchAll, $this->lang->product->branchName[$product->type]);
$branches = array('' => $branchAll) + array(BRANCH_MAIN => $this->lang->branch->main);
if($build->branch)
{
@@ -707,7 +707,7 @@ class build extends control
* AJAX: Get unlinkBranch story and bug.
*
* @param int $buildID
* @param int $branch
* @param int $newBranch
* @access public
* @return void
*/
@@ -876,7 +876,7 @@ class build extends control
else
{
$branchList = $this->loadModel('branch')->getPairs($build->product, '', $build->execution);
$branchAll = $build->productType == 'branch' ? $this->lang->build->allBranch : $this->lang->build->allPlatform;
$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));