From cea279faf14fd3e333610122a72356ca043306cb Mon Sep 17 00:00:00 2001 From: Yagami Date: Wed, 7 Dec 2022 14:49:29 +0800 Subject: [PATCH] * Code for task #78672. --- module/projectrelease/model.php | 15 +++++++++++++++ module/projectrelease/view/view.html.php | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php index 9311581055..ee948df18b 100644 --- a/module/projectrelease/model.php +++ b/module/projectrelease/model.php @@ -35,6 +35,21 @@ class projectreleaseModel extends model $release->branch = trim($release->branch, ','); $release->build = trim($release->build, ','); + $builds = $this->dao->select('id, branch, filePath, scmPath, name, execution, project')->from(TABLE_BUILD)->where('id')->in($release->build)->fetchAll(); + + /* Get release's branches by build. */ + $branches = array(); + if($release->productType != 'normal') + { + foreach($builds as $build) + { + $branch = explode(',', $build->branch); + if(is_array($branch)) $branches += $branch; + } + } + + $release->branches = $branches; + $this->loadModel('file'); $release = $this->file->replaceImgURL($release, 'desc'); $release->files = $this->file->getByObject('release', $releaseID); diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php index 19ed80d00d..12b816fe23 100644 --- a/module/projectrelease/view/view.html.php +++ b/module/projectrelease/view/view.html.php @@ -373,6 +373,14 @@ ?> + type != 'normal'):?> + + release->branch;?> + + branches as $branchID) echo zget($branches, $branchID, '') . ' ';?> + + + release->status;?> processStatus('release', $release);?>