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

* Fix bug#11151.

Browse Source
This commit is contained in:
leiyong
2021-04-06 06:46:21 +03:00
parent d743f24768
commit e9a2d382ea
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+14 -3
View File
@@ -322,13 +322,16 @@ class testtask extends control
$productID = $this->product->saveState($task->product, $this->products);
if($this->app->openApp == 'project')
{
$this->lang->scrum->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
$this->lang->scrum->menu->qa['subMenu']->testtask['subModule'] = '';
$this->loadModel('project')->setMenu($this->session->project);
$this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits');
}
else
{
$this->loadModel('qa')->setMenu($this->products, $task->product);
$this->loadModel('qa')->setMenu($this->products, $productID);
$this->app->rawModule = 'testcase';
}
$this->app->rawModule = 'testcase';
/* Save session. */
$this->session->set('caseList', $this->app->getURI(true), 'qa');
@@ -672,11 +675,15 @@ class testtask extends control
/* Set menu. */
if($this->app->openApp == 'project')
{
$this->lang->scrum->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
$this->lang->scrum->menu->qa['subMenu']->testtask['subModule'] = '';
$this->loadModel('project')->setMenu($this->session->project);
$this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits');
}
else
{
$this->loadModel('qa')->setMenu($this->products, $productID, $task->branch, $taskID);
$this->app->rawModule = 'testcase';
}
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->edit;
@@ -1279,19 +1286,23 @@ class testtask extends control
}
/* Set menu. */
$productID = $this->loadModel('product')->saveState($productID, $this->products);
if($this->app->openApp == 'project')
{
$this->lang->scrum->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
$this->lang->scrum->menu->qa['subMenu']->testtask['subModule'] = '';
$this->loadModel('project')->setMenu($this->session->project);
$this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits');
}
else
{
$this->loadModel('qa')->setMenu($this->products, $productID);
$this->app->rawModule = 'testcase';
}
$this->app->loadLang('job');
$this->app->rawModule = 'testcase';
$productID = $productID ? $productID : key($this->products);
$projectID = $this->app->openApp == 'qa' ? 0 : $this->session->project;
$executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
$builds = empty($productID) ? array() : $this->loadModel('build')->getProductBuildPairs($productID, 0, 'notrunk');