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

* Filter stages.

Browse Source
This commit is contained in:
zhujinyong
2023-02-07 11:29:05 +08:00
parent 2d3e9a725a
commit 5b4fe30491
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/build/control.php
View File

@@ -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);
}

2
module/product/model.php
View File

@@ -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;