From 93430eae9f8896f3217d5e9505817830aab64efb Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 16 Jun 2021 13:20:19 +0800 Subject: [PATCH] * Fix details. --- module/execution/control.php | 8 +++++++- module/project/control.php | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/module/execution/control.php b/module/execution/control.php index e951e05e09..667e0c0093 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1010,9 +1010,15 @@ class execution extends control /* Set execution builds. */ $executionBuilds = array(); + $productList = $this->execution->getProducts($executionID); if(!empty($builds)) { - foreach($builds as $build) $executionBuilds[$build->product][] = $build; + foreach($builds as $build) + { + /* If product is normal, unset branch name. */ + if(isset($productList[$build->product]) and $productList[$build->product]->type == 'normal') $build->branchName = ''; + $executionBuilds[$build->product][] = $build; + } } /* Header and position. */ diff --git a/module/project/control.php b/module/project/control.php index 94d1240df2..7ffeb080ab 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -945,9 +945,15 @@ class project extends control /* Set project builds. */ $projectBuilds = array(); + $productList = $this->project->getProducts($projectID); if(!empty($builds)) { - foreach($builds as $build) $projectBuilds[$build->product][] = $build; + foreach($builds as $build) + { + /* If product is normal, unset branch name. */ + if(isset($productList[$build->product]) and $productList[$build->product]->type == 'normal') $build->branchName = ''; + $projectBuilds[$build->product][] = $build; + } } /* Header and position. */