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

* Modify the code.

Browse Source
This commit is contained in:
tianshujie
2021-11-19 15:33:19 +08:00
parent db6be58c1a
commit 3d09288eca
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+7 -5
View File
@@ -299,8 +299,9 @@ class testcase extends control
*/
public function create($productID, $branch = '', $moduleID = 0, $from = '', $param = 0, $storyID = 0, $extras = '')
{
$testcaseID = ($from and strpos('testcase|work|contribute', $from) !== false) ? $param : 0;
$bugID = $from == 'bug' ? $param : 0;
$testcaseID = ($from and strpos('testcase|work|contribute', $from) !== false) ? $param : 0;
$bugID = $from == 'bug' ? $param : 0;
$executionID = $from == 'execution' ? $param : 0;
$extras = str_replace(array(',', ' '), array('&', ''), $extras);
parse_str($extras, $output);
@@ -471,6 +472,7 @@ class testcase extends control
$this->view->position = $position;
$this->view->projectID = isset($projectID) ? $projectID : 0;
$this->view->productID = $productID;
$this->view->executionID = $executionID;
$this->view->productName = $this->products[$productID];
$this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $branch === 'all' ? 0 : $branch);
$this->view->currentModuleID = $currentModuleID;
@@ -805,8 +807,8 @@ class testcase extends control
/* 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);
if($this->app->tab == 'execution') $this->execution->setMenu($this->session->execution);
if($this->app->tab == 'project') $this->loadModel('project')->setMenu($case->project);
if($this->app->tab == 'execution') $this->execution->setMenu($case->execution);
if($this->app->tab == 'qa') $this->testcase->setMenu($this->products, $productID, $case->branch);
$moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $case->branch);
@@ -825,7 +827,7 @@ class testcase extends control
$product = $this->product->getById($productID);
if($this->app->tab == 'execution' or $this->app->tab == 'project')
{
$objectID = $this->app->tab == 'project' ? $this->session->project : $this->session->execution;
$objectID = $this->app->tab == 'project' ? $case->project : $case->execution;
$productBranches = (isset($product->type) and $product->type != 'normal') ? $this->execution->getBranchByProduct($productID, $objectID) : array();
$branches = isset($productBranches[$productID]) ? $productBranches[$productID] : array();
}
module/testcase/view/create.html.php
+2 -2
View File
@@ -18,8 +18,8 @@
<?php js::set('isonlybody', isonlybody());?>
<?php js::set('executionID', $projectID);?>
<?php js::set('tab', $this->app->tab);?>
<?php if($this->app->tab == 'execution') js::set('objectID', $this->session->execution);?>
<?php if($this->app->tab == 'project') js::set('objectID', $this->session->project);?>
<?php if($this->app->tab == 'execution') js::set('objectID', $executionID);?>
<?php if($this->app->tab == 'project') js::set('objectID', $projectID);?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>