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

* Fix bug#22114.

Browse Source
This commit is contained in:
xieqiyu
2022-04-29 11:29:40 +08:00
parent f005a22eb8
commit 88fbdad2fd
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+2 -2
View File
@@ -420,7 +420,7 @@ class testcase extends control
if($this->app->tab == 'execution' or $this->app->tab == 'project')
{
$objectID = $this->app->tab == 'project' ? $this->session->project : $executionID;
$productBranches = (isset($product->type) and $product->type != 'normal') ? $this->execution->getBranchByProduct($productID, $objectID) : array();
$productBranches = (isset($product->type) and $product->type != 'normal') ? $this->execution->getBranchByProduct($productID, $objectID, 'noclosed|withMain') : array();
$branches = isset($productBranches[$productID]) ? $productBranches[$productID] : array();
$branch = key($branches);
}
@@ -594,7 +594,7 @@ class testcase extends control
{
$this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
$productBranches = $this->loadModel('execution')->getBranchByProduct($productID, $this->session->project);
$productBranches = $this->loadModel('execution')->getBranchByProduct($productID, $this->session->project, 'noclosed|withMain');
$branches = isset($productBranches[$productID]) ? $productBranches[$productID] : array();
$branch = key($branches);
}