From 003f03589cd1b7b1d550feea6eba8a46d076e443 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Thu, 2 Sep 2021 16:47:50 +0800
Subject: [PATCH]  * finish task #42159.

---
 module/install/view/step3.html.php   | 2 +-
 module/upgrade/control.php           | 2 --
 module/upgrade/view/execute.html.php | 5 ++++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/install/view/step3.html.php b/module/install/view/step3.html.php
index b447670166..80ff6dd2c1 100644
--- a/module/install/view/step3.html.php
+++ b/module/install/view/step3.html.php
@@ -53,7 +53,7 @@ EOT;
     </div>
     <div class='modal-body'>
       <div class='form-group'>
-        <?php echo html::textArea('config', $configContent, "rows='15' class='form-control'");?>
+        <?php echo html::textarea('config', $configContent, "rows='15' class='form-control'");?>
       </div>
       <div class='help-block text-center'>
         <?php
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index bea18fc05d..b8ed12f735 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -124,8 +124,6 @@ class upgrade extends control
         $result = $this->upgrade->deleteFiles();
         if($result)
         {
-            $result[] = $this->lang->upgrade->afterDeleted;
-
             $this->view->result = 'fail';
             $this->view->errors  = $result;
 
diff --git a/module/upgrade/view/execute.html.php b/module/upgrade/view/execute.html.php
index 021a10ad25..df15474df1 100644
--- a/module/upgrade/view/execute.html.php
+++ b/module/upgrade/view/execute.html.php
@@ -18,9 +18,12 @@
     <div class='modal-body'>
       <?php if($result == 'fail'):?>
       <div class='alert alert-danger mgb-10'><strong><?php echo $lang->upgrade->fail?></strong></div>
-      <pre><?php echo join('<br />', $errors);?></pre>
+      <?php echo html::textarea('errors', join("\n", $errors), "rows='10' class='form-control' readonly");?>
       <?php endif;?>
     </div>
+    <?php if($result == 'fail'):?>
+    <div class='modal-footer text-left'><?php echo $lang->upgrade->afterDeleted;?> <?php echo html::a('#', $this->lang->refresh, '', "class='btn btn-sm' onclick='location.reload()'");?></div>
+    <?php endif;?>
   </div>
 </div>
 <?php include '../../common/view/footer.lite.html.php';?>