Merge branch 'sprint/174_songchenxuan_45039' into 'master'

* Finish task #45039. See merge request easycorp/zentaopms!704
2021-12-01 06:24:25 +00:00
parent d258b05fd4 839ee66e77
commit 2fc75a1dd4
1 changed files with 9 additions and 1 deletions
@@ -1047,12 +1047,20 @@ class execution extends control
        /* Set execution builds. */
        $executionBuilds = array();
        $productList     = $this->product->getProducts($executionID);
+        $this->app->loadLang('branch');
        if(!empty($builds))
        {
            foreach($builds as $build)
            {
                /* If product is normal, unset branch name. */
-                if(isset($productList[$build->product]) and $productList[$build->product]->type == 'normal') $build->branchName = '';
+                if(isset($productList[$build->product]) and $productList[$build->product]->type == 'normal')
+                {
+                    $build->branchName = '';
+                }
+                else
+                {
+                    $build->branchName = isset($build->branchName) ? $build->branchName : $this->lang->branch->main;
+                }
                $executionBuilds[$build->product][] = $build;
            }
        }