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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2018-09-19 16:47:47 +08:00
parent 232eb30f5c 40d662e996
commit 576752be69
194 changed files with 268 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/model.php
+3 -3
View File
@@ -1249,7 +1249,8 @@ class testtaskModel extends model
break;
case 'lastRunResult':
$lastRunResultText = $run->lastRunResult ? zget($this->lang->testcase->resultList, $run->lastRunResult, $run->lastRunResult) : $this->lang->testcase->unexecuted;
echo html::a(helper::createLink('testtask', 'results', "id={$run->id}", '', true), "<i class='icon icon-list-alt'></i> <span>{$lastRunResultText}</span>", '', "class='iframe btn btn-icon-left'");
$class = 'result-' . $run->lastRunResult;
echo "<span class='$class'>" . $lastRunResultText . "</span>";
break;
case 'story':
if($run->story and $run->storyTitle) echo html::a(helper::createLink('story', 'view', "storyID=$run->story"), $run->storyTitle);
@@ -1268,10 +1269,9 @@ class testtaskModel extends model
echo $run->stepNumber;
break;
case 'actions':
echo "<div class='more'>";
common::printIcon('testcase', 'createBug', "product=$run->product&branch=$run->branch&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,version=$run->version,runID=$run->id,testtask=$task->id", $run, 'list', 'bug', '', 'iframe', '', "data-width='90%'");
echo "</div>";
common::printIcon('testtask', 'results', "id=$run->id", $run, 'list', '', '', 'iframe', '', "data-width='90%'");
common::printIcon('testtask', 'runCase', "id=$run->id", $run, 'list', '', '', 'runCase iframe', false, "data-width='95%'");
if(common::hasPriv('testtask', 'unlinkCase', $run))