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

* Fix bug #12371.

Browse Source
This commit is contained in:
hufangzhou
2021-04-26 09:22:48 +08:00
parent 07245d54af
commit 7ae8f4a32a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+5 -4
View File
@@ -617,8 +617,6 @@ class testcase extends control
}
}
$product = $this->product->getByID($case->product);
$branches = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($case->product);
$isLibCase = ($case->lib and empty($case->product));
if($isLibCase)
{
@@ -633,6 +631,9 @@ class testcase extends control
else
{
$productID = $case->product;
$product = $this->product->getByID($productID);
$branches = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($productID);
if($this->app->openApp == 'project') $this->loadModel('project')->setMenu($this->session->project);
if($this->app->openApp == 'execution') $this->loadModel('execution')->setMenu($this->session->execution);
if($this->app->openApp == 'qa') $this->testcase->setMenu($this->products, $productID, $case->branch);
@@ -640,6 +641,8 @@ class testcase extends control
$this->view->title = "CASE #$case->id $case->title - " . $this->products[$productID];
$this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->product = $product;
$this->view->branches = $branches;
$this->view->productName = $this->products[$productID];
$this->view->branchName = $product->type == 'normal' ? '' : zget($branches, $case->branch, '');
}
@@ -659,7 +662,6 @@ class testcase extends control
$this->view->case = $case;
$this->view->from = $from;
$this->view->taskID = $taskID;
$this->view->product = $product;
$this->view->version = $version ? $version : $case->version;
$this->view->modulePath = $this->tree->getParents($case->module);
$this->view->caseModule = empty($case->module) ? '' : $this->tree->getById($case->module);
@@ -669,7 +671,6 @@ class testcase extends control
$this->view->runID = $from == 'testcase' ? 0 : $run->id;
$this->view->isLibCase = $isLibCase;
$this->view->caseFails = $caseFails;
$this->view->branches = $branches;
$this->display();
}