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

* testcase: only display automated cases when check the only automated option.

Browse Source
This commit is contained in:
liugang
2023-06-30 13:10:51 +08:00
parent 770cdec0a8
commit f3ef1d60f1
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+15 -10
View File
@@ -149,12 +149,15 @@ class testcase extends control
$sort = common::appendOrder($orderBy);
/* Get test cases. */
$queryCondition = '';
$cases = array();
$caseIdList = array();
if($browseType != 'onlyscene')
{
$cases = $this->testcase->getTestCases($productID, $branch, $browseType, $browseType == 'bysearch' ? $queryID : $suiteID, $moduleID, $caseType, $sort, null);
$caseIdList = array_column($cases, 'id');
$cases = $this->testcase->getTestCases($productID, $branch, $browseType, $browseType == 'bysearch' ? $queryID : $suiteID, $moduleID, $caseType, $sort, null);
$queryCondition = $this->dao->get();
$caseIdList = array_column($cases, 'id');
}
/* Get top level cases and scenes.*/
@@ -165,17 +168,19 @@ class testcase extends control
if(count($productParam) > 1) unset($productParam[0]);
}
$queryCondition = '';
$topObjects = $this->testcase->getList($productParam, $branch, $moduleID, $caseIdList, $pager, 'top', array(), $browseType);
$topObjects = array();
if(!$this->cookie->onlyAutoCase)
{
$topObjects = $this->testcase->getList($productParam, $branch, $moduleID, $caseIdList, $pager, 'top', array(), $browseType);
if(empty($topObjects) && $pageID > 1)
{
$pager = pager::init(0, $recPerPage, 1);
$topObjects = $this->testcase->getList($productParam, $branch, $moduleID, $caseIdList, $pager, 'top', array(), $browseType);
}
}
/* Get children cases and scenes.*/
$scenes = $this->testcase->getList($productParam, $branch, $moduleID, $caseIdList, null, 'child', array_keys($topObjects), $browseType, $queryCondition);
if(empty($topObjects) and $pageID > 1)
{
$pager = pager::init(0, $recPerPage, 1);
$topObjects = $this->testcase->getList($productParam, $branch, $moduleID, $caseIdList, $pager, 'top', array(), $browseType);
$scenes = $this->testcase->getList($productParam, $branch, $moduleID, $caseIdList, null, 'child', array_keys($topObjects), $browseType, $queryCondition);
}
/* save session .*/
$this->loadModel('common')->saveQueryCondition($queryCondition, 'testcase', false);