From 59d961dcec4e6e322abdf3abfdecfb029fe6ffdf Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 27 Dec 2023 15:40:19 +0800
Subject: [PATCH] * Fix bug for show execution fail page in afterExec method.

---
 module/upgrade/view/execute.html.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/module/upgrade/view/execute.html.php b/module/upgrade/view/execute.html.php
index 9a2d666d97..c8a19e8252 100644
--- a/module/upgrade/view/execute.html.php
+++ b/module/upgrade/view/execute.html.php
@@ -24,7 +24,8 @@
     <form method='post' onsubmit="submit.disabled=1">
       <?php echo html::hidden('fromVersion', $fromVersion);?>
       <?php if(in_array($result, array('fail', 'sqlFail'))):?>
-      <div class='modal-footer text-left'><?php echo $result == 'sqlFail' ? $lang->upgrade->afterExec : $lang->upgrade->afterDeleted;?> <?php echo html::submitButton($lang->refresh, "onclick='refreshPage(this)'", 'btn btn-sm');?></div>
+      <?php $buttonType = $this->app->rawMethod == 'execute' ? 'submitButton' : 'commonButton';?>
+      <div class='modal-footer text-left'><?php echo $result == 'sqlFail' ? $lang->upgrade->afterExec : $lang->upgrade->afterDeleted;?> <?php echo html::{$buttonType}($lang->refresh, "onclick='refreshPage(this)'", 'btn btn-sm');?></div>
       <?php endif;?>
     </form>
   </div>
@@ -47,11 +48,15 @@
 <script>
 function refreshPage(obj)
 {
+    <?php if($this->app->rawMethod == 'execute'):?>
     $(obj).addClass('disabled');
 
     $('#progress').modal('show');
     updateProgressInterval();
     updateProgress();
+    <?php else:?>
+    location.href = location.href;
+    <?php endif;?>
 }
 </script>
 <?php include '../../common/view/footer.lite.html.php';?>