From 5b4fe30491e5ba5687ddbbe4b1bfe33b3ad28c87 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Tue, 7 Feb 2023 11:29:05 +0800
Subject: [PATCH] * Filter stages.

---
 module/build/control.php | 4 ++--
 module/product/model.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/build/control.php b/module/build/control.php
index 54adc1462a..09736c9ac9 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -81,7 +81,7 @@ class build extends control
         elseif($this->app->tab == 'execution')
         {
             $execution     = $this->execution->getByID($executionID);
-            $executions    = $this->execution->getPairs($execution->project, 'all', 'leaf');
+            $executions    = $this->execution->getPairs($execution->project, 'all', 'stagefilter|leaf');
             $projectID     = $execution->project;
             $productGroups = $this->product->getProducts($executionID);
             $branchGroups  = $this->project->getBranchesByProject($executionID);
@@ -92,7 +92,7 @@ class build extends control
         {
             $execution     = $this->execution->getByID($executionID);
             $projectID     = $execution ? $execution->project : 0;
-            $executions    = $this->execution->getPairs($projectID, 'all', 'leaf');
+            $executions    = $this->execution->getPairs($projectID, 'all', 'stagefilter|leaf');
             $productGroups = $this->product->getProducts($executionID);
             $branchGroups  = $this->project->getBranchesByProject($executionID);
         }
diff --git a/module/product/model.php b/module/product/model.php
index 70248b39e5..27e201ca0f 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1474,7 +1474,7 @@ class productModel extends model
             else
             {
                 $paths = array_slice(explode(',', trim($execution->path, ',')), 1);
-                $executionName = $execution->projectName;
+                $executionName = $projectID != 0 ? '' : $execution->projectName;
                 foreach($paths as $path)
                 {
                     $executionName .= '/' . $allExecutions[$path]->name;