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

* fix bug for can not select integrated build in create bug.

Browse Source
This commit is contained in:
wangyidong
2023-04-06 16:11:49 +08:00
parent e15384c51a
commit 812f4db7b1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/build/model.php
View File

@@ -285,6 +285,7 @@ class buildModel extends model
$this->app->loadLang('branch');
foreach($allBuilds as $id => $build)
{
if($build->branch === '') $build->branch = 0;
if(empty($build->releaseID) and (strpos($params, 'nodone') !== false) and ($build->objectStatus === 'done')) continue;
if((strpos($params, 'noterminate') !== false) and ($build->releaseStatus === 'terminate')) continue;
if((strpos($params, 'withexecution') !== false) and $build->execution and isset($executions[$build->execution])) continue;
@@ -439,7 +440,7 @@ class buildModel extends model
if(!isset($relationBranch[$branch])) $relationBranch[$branch] = $branch;
}
}
$build->branch = implode(',', $relationBranch);
if($relationBranch) $build->branch = implode(',', $relationBranch);
}
$product = $this->loadModel('product')->getByID($build->product);