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

Merge branch 'sprint/194_tianshujie_14741' into 'master'

Browse Source 
Sprint/194 tianshujie 14741

See merge request easycorp/zentaopms!3557
This commit is contained in:
李玉春
2022-05-24 05:39:25 +00:00
parent ffb7904cee 63b5d64dc8
commit 03469dbd1e
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/config.php
+1 -1
View File
@@ -20,7 +20,7 @@ $config->testcase->export->listFields = array('type', 'stage', 'pri', 'status'
$config->testcase->exportFields = '
id, product, branch, module, story,
title, precondition, stepDesc, stepExpect, real, keywords,
pri, type, stage, status, bugsAB, resultsAB, stepNumberAB, lastRunResult, openedBy, openedDate,
pri, type, stage, status, bugsAB, resultsAB, stepNumberAB, lastRunner, lastRunDate, lastRunResult, openedBy, openedDate,
lastEditedBy, lastEditedDate, version, linkCase, files';
$config->testcase->customCreateFields = 'story,stage,pri,keywords';
module/testcase/control.php
+10 -17
View File
@@ -1455,23 +1455,15 @@ class testcase extends control
/* Get cases. */
if($this->session->testcaseOnlyCondition)
{
if($taskID)
{
$caseIDList = $this->dao->select('`case`')->from(TABLE_TESTRUN)->where('task')->eq($taskID)->fetchPairs();
$cases = $this->dao->select('*')->from(TABLE_CASE)->where($this->session->testcaseQueryCondition)->andWhere('id')->in($caseIDList)
->beginIF($this->post->exportType == 'selected')->andWhere('id')->in($this->cookie->checkedItem)->fi()
->orderBy($orderBy)
->beginIF($this->post->limit)->limit($this->post->limit)->fi()
->fetchAll('id');
}
else
{
$cases = $this->dao->select('*')->from(TABLE_CASE)->where($this->session->testcaseQueryCondition)
->beginIF($this->post->exportType == 'selected')->andWhere('id')->in($this->cookie->checkedItem)->fi()
->orderBy($orderBy)
->beginIF($this->post->limit)->limit($this->post->limit)->fi()
->fetchAll('id');
}
$caseIDList = array();
if($taskID) $caseIDList = $this->dao->select('`case`')->from(TABLE_TESTRUN)->where('task')->eq($taskID)->fetchPairs();
$cases = $this->dao->select('*')->from(TABLE_CASE)->where($this->session->testcaseQueryCondition)
->beginIF($taskID)->andWhere('id')->in($caseIDList)->fi()
->beginIF($this->post->exportType == 'selected')->andWhere('id')->in($this->cookie->checkedItem)->fi()
->orderBy($orderBy)
->beginIF($this->post->limit)->limit($this->post->limit)->fi()
->fetchAll('id');
}
else
{
@@ -1590,6 +1582,7 @@ class testcase extends control
if(isset($caseLang->statusList[$case->status])) $case->status = $this->processStatus('testcase', $case);
if(isset($users[$case->openedBy])) $case->openedBy = $users[$case->openedBy];
if(isset($users[$case->lastEditedBy])) $case->lastEditedBy = $users[$case->lastEditedBy];
if(isset($users[$case->lastRunner])) $case->lastRunner = $users[$case->lastRunner];
if(isset($caseLang->resultList[$case->lastRunResult])) $case->lastRunResult = $caseLang->resultList[$case->lastRunResult];
$case->bugsAB = $case->bugs; unset($case->bugs);