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

* Update the object associated with the use case through the operation record.

Browse Source
This commit is contained in:
leiyong
2023-08-17 01:41:19 +00:00
parent 6527e17457
commit 51295d3f20
17 changed files with 562 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
-5
View File
@@ -394,7 +394,6 @@ class testtask extends control
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
$cases = array();
$runs = $this->loadModel('testcase')->appendData($runs, 'testrun');
foreach($runs as $run) $cases[$run->case] = $run;
$results = $this->dao->select('*')->from(TABLE_TESTRESULT)->where('`case`')->in(array_keys($cases))->andWhere('run')->in(array_keys($runs))->fetchAll('run');
@@ -552,9 +551,6 @@ class testtask extends control
unset($this->config->testcase->search['params']['branch']);
$this->loadModel('search')->setSearchParams($this->config->testcase->search);
/* Append bugs and results. */
$runs = $this->testcase->appendData($runs, 'run');
$case2RunMap = array();
foreach($runs as $run) $case2RunMap[$run->case] = $run->id;
@@ -708,7 +704,6 @@ class testtask extends control
$runs = $this->testtask->getRuns($taskID, 0, $groupBy);
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
$runs = $this->testcase->appendData($runs, 'run');
$groupCases = array();
$groupByList = array();
foreach($runs as $run)
module/testtask/model.php
+1
View File
@@ -1735,6 +1735,7 @@ class testtaskModel extends model
echo $run->stepNumber;
break;
case 'actions':
$run->fails = $run->taskFails;
common::printIcon('testcase', 'createBug', "product=$run->product&branch=$run->branch&extra=executionID=$task->execution,buildID=$task->build,caseID=$run->case,version=$run->version,runID=$run->id,testtask=$task->id", $run, 'list', 'bug', '', 'iframe', '', "data-width='90%'");
common::printIcon('testtask', 'runCase', "id=$run->id", $run, 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");
module/testtask/view/groupcase.html.php
+3 -3
View File
@@ -72,9 +72,9 @@
<td><?php if(!helper::isZeroDate($run->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($run->lastRunDate));?></td>
<td class='<?php echo $run->lastRunResult;?>'><?php if($run->lastRunResult) echo $lang->testcase->resultList[$run->lastRunResult];?></td>
<td class='<?php echo $run->status;?>'><?php echo $this->processStatus('testcase', $run);?></td>
<td><?php echo (common::hasPriv('testcase', 'bugs') and $run->bugs) ? html::a($this->createLink('testcase', 'bugs', "runID={$run->id}&caseID={$run->case}"), $run->bugs, '', "class='iframe'") : $run->bugs;?></td>
<td><?php echo (common::hasPriv('testtask', 'results') and $run->results) ? html::a($this->createLink('testtask', 'results', "runID={$run->id}&caseID={$run->case}"), $run->results, '', "class='iframe'") : $run->results;?></td>
<td><?php echo $run->stepNumber;?></td>
<td><?php echo (common::hasPriv('testcase', 'bugs') and $run->taskBugs) ? html::a($this->createLink('testcase', 'bugs', "runID={$run->id}&caseID={$run->case}"), $run->taskBugs, '', "class='iframe'") : $run->taskBugs;?></td>
<td><?php echo (common::hasPriv('testtask', 'results') and $run->taskExecutions) ? html::a($this->createLink('testtask', 'results', "runID={$run->id}&caseID={$run->case}"), $run->taskExecutions, '', "class='iframe'") : $run->taskExecutions;?></td>
<td><?php echo $run->taskSteps;?></td>
<td class='c-actions'>
<?php if($canBeChanged):?>
<?php common::printIcon('testtask', 'runCase', "runID=$run->id&caseID=$run->case&version=$run->version", '', 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");?>