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

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

Browse Source 
* Fix bug #16682.

See merge request easycorp/zentaopms!697
This commit is contained in:
李玉春
2021-12-01 03:21:02 +00:00
parent 5b00079375 9a7bd2a6fc
commit ccc6de5463
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+33 -33
View File
@@ -352,39 +352,6 @@ class testcase extends control
}
if(empty($this->products)) $this->locate($this->createLink('product', 'create'));
/* Set productID and branch. */
$productID = $this->product->saveState($productID, $this->products);
if($branch === '') $branch = $this->cookie->preBranch;
/* Set menu. */
if($this->app->tab == 'project' or $this->app->tab == 'execution') $this->loadModel('execution');
if($this->app->tab == 'project')
{
$this->loadModel('project')->setMenu($this->session->project);
}
elseif($this->app->tab == 'execution')
{
$this->execution->setMenu($this->session->execution);
}
else
{
$this->qa->setMenu($this->products, $productID, $branch);
}
/* Set branch. */
$product = $this->product->getById($productID);
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();
$branches = isset($productBranches[$productID]) ? $productBranches[$productID] : array();
$branch = key($branches);
}
else
{
$branches = (isset($product->type) and $product->type != 'normal') ? $this->loadModel('branch')->getPairs($productID, 'active') : array();
}
/* Init vars. */
$type = 'feature';
$stage = '';
@@ -423,6 +390,39 @@ class testcase extends control
$steps = $this->testcase->createStepsFromBug($bug->steps);
}
/* Set productID and branch. */
$productID = $this->product->saveState($productID, $this->products);
if($branch === '') $branch = $this->cookie->preBranch;
/* Set menu. */
if($this->app->tab == 'project' or $this->app->tab == 'execution') $this->loadModel('execution');
if($this->app->tab == 'project')
{
$this->loadModel('project')->setMenu($this->session->project);
}
elseif($this->app->tab == 'execution')
{
$this->execution->setMenu($this->session->execution);
}
else
{
$this->qa->setMenu($this->products, $productID, $branch);
}
/* Set branch. */
$product = $this->product->getById($productID);
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();
$branches = isset($productBranches[$productID]) ? $productBranches[$productID] : array();
$branch = key($branches);
}
else
{
$branches = (isset($product->type) and $product->type != 'normal') ? $this->loadModel('branch')->getPairs($productID, 'active') : array();
}
/* Padding the steps to the default steps count. */
if(count($steps) < $this->config->testcase->defaultSteps)
{