From d1317508d7d6173fb05aecf662c8449775838bcd Mon Sep 17 00:00:00 2001
From: liyang <liyang@easycorp.ltd>
Date: Thu, 15 Aug 2024 11:28:52 +0800
Subject: [PATCH] + [Bug#53860] Fix bug on exec auto test case.

---
 module/testtask/lang/de.php         | 2 +-
 module/testtask/lang/en.php         | 2 +-
 module/testtask/lang/fr.php         | 2 +-
 module/testtask/lang/zh-cn.php      | 2 +-
 module/testtask/model.php           | 1 +
 module/testtask/ui/results.html.php | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index f04cf40e63..437b5eb248 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -26,7 +26,7 @@ $lang->testtask->unlinkCase       = "Verknüpfung aufheben";
 $lang->testtask->batchUnlinkCases = "Mehrere Verknüpfungen aufheben";
 $lang->testtask->batchAssign      = "Mehrere zuordnen";
 $lang->testtask->runCase          = "Ausführen";
-$lang->testtask->running          = "Excuting";
+$lang->testtask->running          = ", running.";
 $lang->testtask->runningLog       = "Execution Log";
 $lang->testtask->runNode          = "Executed by %s,Execute on node %s %s";
 $lang->testtask->batchRun         = "Mehrere ausführen";
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index bfcd232653..a00566d362 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -26,7 +26,7 @@ $lang->testtask->unlinkCase       = "Unlink";
 $lang->testtask->batchUnlinkCases = "Batch Unlink Cases";
 $lang->testtask->batchAssign      = "Batch Assign";
 $lang->testtask->runCase          = "Run";
-$lang->testtask->running          = "Excuting";
+$lang->testtask->running          = ", running.";
 $lang->testtask->runningLog       = "Execution Log";
 $lang->testtask->runNode          = "Executed by %s,Execute on node %s %s";
 $lang->testtask->batchRun         = "Batch Run";
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 71ecb5112c..1ed96152c6 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -26,7 +26,7 @@ $lang->testtask->unlinkCase       = "Exclure";
 $lang->testtask->batchUnlinkCases = "Exclure CasTests par Lot";
 $lang->testtask->batchAssign      = "Affecter par Lot";
 $lang->testtask->runCase          = "Jouer";
-$lang->testtask->running          = "Excuting";
+$lang->testtask->running          = ", running.";
 $lang->testtask->runningLog       = "Execution Log";
 $lang->testtask->runNode          = "Executed by %s,Execute on node %s %s";
 $lang->testtask->batchRun         = "Jouer par Lot";
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index cf11f309f7..214307554d 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -26,7 +26,7 @@ $lang->testtask->unlinkCase       = "移除";
 $lang->testtask->batchUnlinkCases = "批量移除用例";
 $lang->testtask->batchAssign      = "批量指派";
 $lang->testtask->runCase          = "执行";
-$lang->testtask->running          = "执行中";
+$lang->testtask->running          = "，正在执行中。";
 $lang->testtask->runningLog       = "执行日志";
 $lang->testtask->runNode          = "由%s，在执行节点%s上 %s";
 $lang->testtask->batchRun         = "批量执行";
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 096270ddf7..bbae21d039 100755
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1585,6 +1585,7 @@ class testtaskModel extends model
 
             foreach($stepResults as $step)
             {
+                if(!isset($step['result'])) continue;
                 if($step['result'] == 'pass')
                 {
                     $passCount++;
diff --git a/module/testtask/ui/results.html.php b/module/testtask/ui/results.html.php
index 3eb8096c2a..45f186652b 100644
--- a/module/testtask/ui/results.html.php
+++ b/module/testtask/ui/results.html.php
@@ -178,7 +178,7 @@ foreach($results as $i => $result)
     $stepResultTrs[] = !empty($result->ZTFResult) && $result->node > 0 ? div
     (
         h::p($lang->testtask->runningLog),
-        h::p($result->ZTFResult)
+        h::p(html($result->ZTFResult))
     ) : '';
 
     $projectParam   = $this->app->tab == 'project' ? "projectID={$this->session->project}," : '';