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

Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'

Browse Source 
* Finish Task #78673#78688

See merge request easycorp/zentaopms!6489
This commit is contained in:
孙广明
2022-12-07 07:01:14 +00:00
parent 5ae031e0c6 5f3444278b
commit 50bb73fe57
7 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/projectrelease/model.php
+14 -1
View File
@@ -85,7 +85,20 @@ class projectreleaseModel extends model
{
$release->project = trim($release->project, ',');
$release->branch = trim($release->branch, ',');
$release->build = trim($release->build, ',');
$branchName = '';
if($release->branch != 'normal')
{
foreach(explode(',', $release->branch) as $releaseBranch)
{
$branchName .= $this->loadModel('branch')->getById($releaseBranch);
$branchName .= ',';
}
$branchName = trim($branchName, ',');
}
$release->branchName = empty($branchName) ? $this->lang->branch->main : $branchName;
$release->build = trim($release->build, ',');
$buildIdList = array_merge($buildIdList, explode(',', $release->build));
}