From f82e4fd769c797669740c87ca63bd4d28ab4afaa Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 5 Jan 2024 10:17:46 +0800
Subject: [PATCH] * Adjust for sync from 18.x.

---
 module/upgrade/js/consistency.ui.js    | 1 +
 module/upgrade/ui/consistency.html.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/upgrade/js/consistency.ui.js b/module/upgrade/js/consistency.ui.js
index e83806eae0..ef031d4722 100644
--- a/module/upgrade/js/consistency.ui.js
+++ b/module/upgrade/js/consistency.ui.js
@@ -10,6 +10,7 @@ function updateProgressInterval()
             logOffset = result.offset;
 
             if(result.log) $('#logBox').append(result.log);
+            $('#progressBox').html(result.progress + '%');
 
             let element = document.getElementById('logBox');
             element.scrollTop = element.scrollHeight;
diff --git a/module/upgrade/ui/consistency.html.php b/module/upgrade/ui/consistency.html.php
index 474f638eff..cd2c0ef4c8 100644
--- a/module/upgrade/ui/consistency.html.php
+++ b/module/upgrade/ui/consistency.html.php
@@ -33,7 +33,8 @@ div
                 div
                 (
                     setClass('font-bold mb-2'),
-                    $hasError ? $lang->upgrade->noticeErrSQL : $lang->upgrade->showSQLLog
+                    $hasError ? $lang->upgrade->noticeErrSQL : $lang->upgrade->showSQLLog,
+                    $hasError ? null : span(setID('progressBox'))
                 ),
                 div
                 (