From 2ed8646488c562e2aa8a1f4ca48bf01f5577c1c7 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Sun, 24 Apr 2022 09:31:14 +0800
Subject: [PATCH 1/2] * Fix bug #21948.

---
 module/testtask/model.php                      | 2 +-
 module/testtask/view/importunitresult.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/testtask/model.php b/module/testtask/model.php
index 0c44197e46..e28292967c 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1595,7 +1595,7 @@ class testtaskModel extends model
         if(empty($file))
         {
             dao::$errors[] = $this->lang->testtask->unitXMLFormat;
-            return print(js::error(dao::getError()));
+            die(js::error(dao::getError()));
         }
 
         $file     = $file[0];
diff --git a/module/testtask/view/importunitresult.html.php b/module/testtask/view/importunitresult.html.php
index 2212a742e6..73ded709a6 100644
--- a/module/testtask/view/importunitresult.html.php
+++ b/module/testtask/view/importunitresult.html.php
@@ -67,7 +67,7 @@
         </tr>
         <tr>
           <th><?php echo $lang->testtask->resultFile;?></th>
-          <td><?php echo html::file('resultFile', "class='form-control'");?></td>
+          <td class='required'><?php echo html::file('resultFile', "class='form-control'");?></td>
           <td><?php echo $lang->testtask->unitXMLFormat;?></td>
         </tr>
         <tr>

From 181d0d67de1c2cd3fd3e7cf6f202470039b7af31 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Sun, 24 Apr 2022 09:58:10 +0800
Subject: [PATCH 2/2] * Fix bug #21948.

---
 module/testtask/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/testtask/model.php b/module/testtask/model.php
index e28292967c..6e8562b065 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1595,7 +1595,7 @@ class testtaskModel extends model
         if(empty($file))
         {
             dao::$errors[] = $this->lang->testtask->unitXMLFormat;
-            die(js::error(dao::getError()));
+            return false;
         }
 
         $file     = $file[0];
@@ -1604,7 +1604,7 @@ class testtaskModel extends model
         if(simplexml_load_file($fileName) === false)
         {
             dao::$errors[] = $this->lang->testtask->cannotBeParsed;
-            return print(js::error(dao::getError()));
+            return false;
         }
 
         $frame = $this->post->frame;