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

* Finish task #45011.

Browse Source
This commit is contained in:
tianshujie
2021-11-27 19:17:38 +08:00
parent 0690823866
commit f2b60bda9e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/testtask/control.php
View File

@@ -1229,6 +1229,7 @@ class testtask extends control
*/
public function batchRun($productID, $orderBy = 'id_desc', $from = 'testcase', $taskID = 0)
{
$this->loadModel('tree');
$url = $this->session->caseList ? $this->session->caseList : $this->createLink('testcase', 'browse', "productID=$productID");
if($this->post->results)
{
@@ -1256,7 +1257,7 @@ class testtask extends control
{
$this->loadModel('qa')->setMenu($this->products, $productID, $taskID);
}
$this->view->moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, 'all');
$this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, 'case', 0, 'all');
$cases = $this->dao->select('*')->from(TABLE_CASE)->where('id')->in($caseIDList)->fetchAll('id');
}

3
module/testtask/view/batchrun.html.php
View File

@@ -28,13 +28,14 @@
<th><?php echo $lang->testcase->stepDesc . '/' . $lang->testcase->stepExpect?></th>
</tr>
</thead>
<?php $moduleOptionMenu = $productID ? $moduleOptionMenu : array();?>
<?php foreach($cases as $caseID => $case):?>
<?php if($case->status == 'wait') continue;?>
<?php
if(!$productID)
{
echo html::hidden("caseIDList[$case->id]", $caseID);
$moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($case->product, $viewType = 'case', $startModuleID = 0);
if(!isset($moduleOptionMenu[$case->module])) $moduleOptionMenu += $this->tree->getOptionMenu($case->product, 'case', 0, $case->branch);
}
?>
<tr class='text-center'>