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

* Finish task #36756.

Browse Source
This commit is contained in:
holan20180123
2021-03-17 13:15:36 +08:00
parent 04e0105468
commit 62843dd5a0
7 changed files with 111 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/model.php
+8 -4
View File
@@ -1268,7 +1268,7 @@ class testtaskModel extends model
{
$runs = array();
$postData = fixer::input('post')->get();
$caseIdList = array_keys($postData->results);
$caseIdList = isset($postData->caseIDList) ? array_keys($postData->caseIDList) : array_keys($postData->results);
if($runCaseType == 'testtask')
{
$runs = $this->dao->select('id, `case`')->from(TABLE_TESTRUN)
@@ -1287,7 +1287,8 @@ class testtaskModel extends model
$now = helper::now();
foreach($postData->results as $caseID => $result)
{
$runID = isset($runs[$caseID]) ? $runs[$caseID] : 0;
$runID = isset($runs[$caseID]) ? $runs[$caseID] : (isset($postData->caseIDList) ? $caseID : 0);
$version = $postData->version[$caseID];
$dbSteps = isset($stepGroups[$caseID]) ? $stepGroups[$caseID] : array();
$postSteps = isset($postData->steps[$caseID]) ? $postData->steps[$caseID] : array();
$postReals = $postData->reals[$caseID];
@@ -1309,13 +1310,16 @@ class testtaskModel extends model
$step = array();
$step['result'] = $caseResult;
$step['real'] = $caseResult == 'pass' ? '' : $postReals[0];
$stepResults[] = $step;
$stepResults[] = $step;
}
/* Replace caseID if caseID is runID. */
if(isset($postData->caseIDList[$caseID])) $caseID = $postData->caseIDList[$caseID];
$result = new stdClass();
$result->run = $runID;
$result->case = $caseID;
$result->version = $postData->version[$caseID];
$result->version = $version;
$result->caseResult = $caseResult;
$result->stepResults = serialize($stepResults);
$result->lastRunner = $this->app->user->account;