From 702f9495916b27e9dc7efbaeb6600198d6dbc293 Mon Sep 17 00:00:00 2001 From: lihaipeng Date: Wed, 4 Sep 2024 10:34:46 +0800 Subject: [PATCH] return button after successful migration --- ...rn-button-after-successful-migration.patch | 34 +++++++++++++++++++ migration-tools.spec | 7 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0006-return-button-after-successful-migration.patch diff --git a/0006-return-button-after-successful-migration.patch b/0006-return-button-after-successful-migration.patch new file mode 100644 index 0000000..6f3ca94 --- /dev/null +++ b/0006-return-button-after-successful-migration.patch @@ -0,0 +1,34 @@ +From c0a6b3177b4e736eb4d9531567d7cb2b92180c3f Mon Sep 17 00:00:00 2001 +From: lihaipeng +Date: Wed, 4 Sep 2024 10:30:21 +0800 +Subject: [PATCH] Return button after successful migration + +--- + templates/MT_migration_results.html | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/templates/MT_migration_results.html b/templates/MT_migration_results.html +index fef5292..c6f5f33 100755 +--- a/templates/MT_migration_results.html ++++ b/templates/MT_migration_results.html +@@ -89,6 +89,8 @@ +
+
+
++ ++ + + + +@@ -158,7 +160,7 @@ + } + + function close_tool() { +- alert("确定关闭迁移软件吗?"); ++ window.location.href="/MT_agreement" + } + + +-- +2.43.0 + diff --git a/migration-tools.spec b/migration-tools.spec index 8967aa8..a8a82d7 100644 --- a/migration-tools.spec +++ b/migration-tools.spec @@ -1,6 +1,6 @@ Name: migration-tools Version: 1.0.1 -Release: 8 +Release: 9 License: MulanPSL-2.0 Summary: A tool to help users migrate the Centos system to the UOS system and openEuler system Source0: migration-tools.tar.gz @@ -12,6 +12,7 @@ Patch1: 0002-modify-description.patch Patch2: 0003-adjust-the-display-sequence.patch Patch3: 0004-fix-cancel-button-function-in-tool.patch Patch4: 0005-system-check-page-before-migration-displayed.patch +Patch5: 0006-return-button-after-successful-migration.patch # CVE patches: >= 100 Patch100: 100-CVE-2024-24892.patch @@ -62,6 +63,7 @@ Migration software server side %patch 2 -p1 %patch 3 -p1 %patch 4 -p1 +%patch 5 -p1 %patch 100 -p1 %if 0%{?openEuler} @@ -117,6 +119,9 @@ rm -rf /usr/bin/migration-tools %endif %changelog +* Wed Sep 04 2024 lihaipeng - 1.0.1-9 +- return button after successful migration + * Fri Aug 30 2024 lihaipeng - 1.0.1-8 - the system check page before migration is displayed -- Gitee