From acfb2b6f95d12a094ba8605f28274fc3efeeebda Mon Sep 17 00:00:00 2001
From: lihaipeng <lihaipeng@uniontech.com>
Date: Tue, 27 Aug 2024 15:51:30 +0800
Subject: [PATCH] fix cancel button function in tool

(cherry picked from commit 9d14b86be27d49e45fcce266ccd31df6e5a59220)
---
 0004-fix-cancel-button-function-in-tool.patch | 155 ++++++++++++++++++
 migration-tools.spec                          |   7 +-
 2 files changed, 161 insertions(+), 1 deletion(-)
 create mode 100644 0004-fix-cancel-button-function-in-tool.patch

diff --git a/0004-fix-cancel-button-function-in-tool.patch b/0004-fix-cancel-button-function-in-tool.patch
new file mode 100644
index 0000000..ab7b5e1
--- /dev/null
+++ b/0004-fix-cancel-button-function-in-tool.patch
@@ -0,0 +1,155 @@
+From 0878a6820be950685d5c79abe8a655b2734b4534 Mon Sep 17 00:00:00 2001
+From: lihaipeng <lihaipeng@uniontech.com>
+Date: Tue, 27 Aug 2024 15:27:38 +0800
+Subject: [PATCH 2/2] fix-cancel-button-function-in-tool
+
+---
+ templates/MT_agreement.html  | 6 +++---
+ templates/MT_check_evn.html  | 8 ++++----
+ templates/MT_check_root.html | 4 ++--
+ templates/MT_kernel.html     | 4 ++--
+ templates/MT_note.html       | 4 ++--
+ templates/MT_repo.html       | 4 ++--
+ 6 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/templates/MT_agreement.html b/templates/MT_agreement.html
+index d15a399..40150bf 100755
+--- a/templates/MT_agreement.html
++++ b/templates/MT_agreement.html
+@@ -86,7 +86,7 @@
+ 	<div class="menter_btn_a_lf">
+ 		<br/>
+ 		<input name="readpact" type="checkbox" id="readpact" value="" class="check_boxId" /><label for="readpact"><strong class="fc-690 fs-14" data-locale="Consent_Agreements">我已经阅读并同意此协议</strong></label>
+-        <button onclick="close_tool();" data-toggle="modal" data-target="#exampleModal" type="submit" class="menter_btn_a_a_lf" data-locale="Exit" style="text-align: center; line-height: 37px; color:black; font-size:18px;"><style>a{TEXT-DECORATION:none}</style>取消</button>
++		<!--- <button onclick="close_tool();" data-toggle="modal" data-target="#exampleModal" type="submit" class="menter_btn_a_a_lf" data-locale="Exit" style="text-align: center; line-height: 37px; color:black; font-size:18px;"><style>a{TEXT-DECORATION:none}</style>取消</button> --->
+  	    <a href="javascript:return false;" id="paymentId" data-locale="Next_Step" type="button" class="menter_btn_a_a_lf" name="" style="text-align: center; line-height: 37px; color:black; font-size:18px; opacity: 0.2"><style>a{TEXT-DECORATION:none}</style>下一步</a>
+ 	</div>
+ </div>
+@@ -119,8 +119,8 @@
+     });
+ 
+     function close_tool() {
+-        alert("确定关闭迁移软件吗?")
+-	}
++	alert("确定关闭迁移软件吗?")
++    }
+ 
+ </script>
+ </body>
+diff --git a/templates/MT_check_evn.html b/templates/MT_check_evn.html
+index fe9c8d8..47b2029 100755
+--- a/templates/MT_check_evn.html
++++ b/templates/MT_check_evn.html
+@@ -52,7 +52,7 @@
+         <hr style="opacity: 0.1;border: 1px solid #4C4D4E;width:99%;" />
+         </br>
+         </br>
+-        <button onclick="close_tool();" data-toggle="modal" data-target="#exampleModal" type="submit" class="menter_btn_a_a_lf" data-locale="Exit" style="text-align: center; line-height: 37px; color:black; font-size:18px;"><style>a{TEXT-DECORATION:none}</style>取消</button>
++        <button onclick="close_tool();" data-toggle="modal" data-target="#exampleModal" type="submit" class="menter_btn_a_a_lf" data-locale="Exit" style="text-align: center; line-height: 37px; color:black; font-size:18px;"><style>a{TEXT-DECORATION:none}</style>上一步</button>
+         <button id="check_id" onclick="save()" type="submit" class="menter_btn_a_a_lf" name="" style="text-align: center; line-height: 37px; color:black; font-size:18px;opacity: 0.2;" disabled = "disabled"><style>a{TEXT-DECORATION:none}</style>下一步</button>
+     </div>
+     </div>
+@@ -131,9 +131,9 @@
+         window.location.href="MT_check_user"
+     }
+ 
+-	function close_tool() {
+-        alert("确定关闭迁移软件吗?");
+-	}
++    function close_tool() {
++        window.location.href="MT_note"
++    }
+ </script>
+ </body>
+ </html>
+diff --git a/templates/MT_check_root.html b/templates/MT_check_root.html
+index cb5d346..5e4ce52 100755
+--- a/templates/MT_check_root.html
++++ b/templates/MT_check_root.html
+@@ -72,7 +72,7 @@
+         <hr style="opacity: 0.1;border: 1px solid #4C4D4E;width:99%;" />
+         </br>
+         </br>
+-        <button onclick="close_tool();" data-toggle="modal" data-target="#exampleModal" type="submit" class="menter_btn_a_a_lf" data-locale="Exit" style="text-align: center; line-height: 37px; color:black; font-size:18px;"><style>a{TEXT-DECORATION:none}</style>取消</button>
++        <button onclick="close_tool();" data-toggle="modal" data-target="#exampleModal" type="submit" class="menter_btn_a_a_lf" data-locale="Exit" style="text-align: center; line-height: 37px; color:black; font-size:18px;"><style>a{TEXT-DECORATION:none}</style>上一步</button>
+         <button id="check_id" disabled="disabled" data-locale="Next_Step" type="submit" class="menter_btn_a_a_lf" name="" style="text-align: center; line-height: 37px; color:black; font-size:18px;opacity: 0.2" onclick="save()"><style>a{TEXT-DECORATION:none}</style>下一步</button>
+     </div>
+     </div>
+@@ -122,7 +122,7 @@
+     }
+ 
+     function close_tool() {
+-        alert("确定关闭迁移软件吗?");
++	 window.location.href="MT_check_env"
+     }
+ 
+ 	$("#uname_id").bind("input propertychange",function(event){
+diff --git a/templates/MT_kernel.html b/templates/MT_kernel.html
+index e8b93c8..9553bc6 100755
+--- a/templates/MT_kernel.html
++++ b/templates/MT_kernel.html
+@@ -53,7 +53,7 @@
+         <hr style="opacity: 0.1;border: 1px solid #4C4D4E;width:99%;" />
+         </br>
+         </br>
+-        <button onclick="close_tool();" data-toggle="modal" data-target="#exampleModal" type="submit" class="menter_btn_a_a_lf" data-locale="Exit" style="text-align: center; line-height: 37px; color:black; font-size:18px;"><style>a{TEXT-DECORATION:none}</style>取消</button>
++        <button onclick="close_tool();" data-toggle="modal" data-target="#exampleModal" type="submit" class="menter_btn_a_a_lf" data-locale="Exit" style="text-align: center; line-height: 37px; color:black; font-size:18px;"><style>a{TEXT-DECORATION:none}</style>上一步</button>
+         <button id="check_note"  type="submit" class="menter_btn_a_a_lf" name="" style="text-align: center; line-height: 37px; color:black; font-size:18px;opacity: 1" onclick="save()"><style>a{TEXT-DECORATION:none}</style>下一步</button>
+     </div>
+     </div>
+@@ -115,7 +115,7 @@
+ 
+ 
+     function close_tool() {
+-        alert("确定关闭迁移软件吗?");
++    	window.location.href="MT_repo"
+     }
+ 
+ </script>
+diff --git a/templates/MT_note.html b/templates/MT_note.html
+index 1a79009..2da1294 100755
+--- a/templates/MT_note.html
++++ b/templates/MT_note.html
+@@ -48,7 +48,7 @@
+         <hr style="opacity: 0.1;border: 1px solid #4C4D4E;width:99%;" />
+ 		</br>
+ 		</br>
+-		<button onclick="close_tool();" data-toggle="modal" data-target="#exampleModal" type="submit" class="menter_btn_a_a_lf" data-locale="Exit" style="text-align: center; line-height: 37px; color:black; font-size:18px;"><style>a{TEXT-DECORATION:none}</style>取消</button>
++		<button onclick="close_tool();" data-toggle="modal" data-target="#exampleModal" type="submit" class="menter_btn_a_a_lf" data-locale="Exit" style="text-align: center; line-height: 37px; color:black; font-size:18px;"><style>a{TEXT-DECORATION:none}</style>上一步</button>
+         <button id="check_note"  data-locale="Next_Step" type="submit" class="menter_btn_a_a_lf" name="" style="text-align: center; line-height: 37px; color:black; font-size:18px;opacity: 1" onclick="save()"><style>a{TEXT-DECORATION:none}</style>下一步</button>
+     </div>
+     </div>
+@@ -75,7 +75,7 @@
+     }
+ 
+     function close_tool() {
+-        alert("确定关闭迁移软件吗?");
++	window.location = '/MT_agreement';
+     }
+ 
+ </script>
+diff --git a/templates/MT_repo.html b/templates/MT_repo.html
+index 2c145af..c5fa384 100755
+--- a/templates/MT_repo.html
++++ b/templates/MT_repo.html
+@@ -54,7 +54,7 @@
+     <div class="menter_btn_a_lf" >
+         <hr style="opacity: 0.1;border: 1px solid #4C4D4E;width:99%;" />
+     	</br>
+-        <button onclick="close_tool();" data-toggle="modal" data-target="#exampleModal" type="submit" class="menter_btn_a_a_lf" data-locale="Exit" style="text-align: center; line-height: 37px; color:black; font-size:18px;"><style>a{TEXT-DECORATION:none}</style>取消</button>
++        <button onclick="close_tool();" data-toggle="modal" data-target="#exampleModal" type="submit" class="menter_btn_a_a_lf" data-locale="Exit" style="text-align: center; line-height: 37px; color:black; font-size:18px;"><style>a{TEXT-DECORATION:none}</style>上一步</button>
+ 		<button id="check_repo" disabled="disabled" data-locale="Next_Step" type="submit" class="menter_btn_a_a_lf" name="" style="text-align: center; line-height: 37px; color:black; font-size:18px;opacity: 0.2" onclick="save()"><style>a{TEXT-DECORATION:none}</style>下一步</button>
+     </div>
+     </div>
+@@ -102,7 +102,7 @@
+ 	}
+ 
+     function close_tool() {
+-        alert("确定关闭迁移软件吗");
++	window.location.href="MT_check_user"
+     }
+ 
+ 	$("#repo_pwd").bind("input propertychange",function(event){
+-- 
+2.43.0
+
diff --git a/migration-tools.spec b/migration-tools.spec
index 63c67ba..6678440 100644
--- a/migration-tools.spec
+++ b/migration-tools.spec
@@ -1,6 +1,6 @@
 Name:       migration-tools
 Version:    1.0.1
-Release:    6
+Release:    7
 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
@@ -10,6 +10,7 @@ Source2:    xlwt-1.3.0-py2.py3-none-any.whl
 Patch0:     0001-use-kill-not-kill-INT-when-stop-service.patch
 Patch1:     0002-modify-description.patch
 Patch2:     0003-adjust-the-display-sequence.patch
+Patch3:	    0004-fix-cancel-button-function-in-tool.patch
 
 # CVE patches: >= 100
 Patch100:   100-CVE-2024-24892.patch
@@ -58,6 +59,7 @@ Migration software server side
 %patch 0 -p1
 %patch 1 -p1
 %patch 2 -p1
+%patch 3 -p1
 %patch 100 -p1
 
 %if 0%{?openEuler}
@@ -113,6 +115,9 @@ rm -rf /usr/bin/migration-tools
 %endif
 
 %changelog
+* Tue Aug 27 2024 lihaipeng <lihaipeng@uniontech.com> - 1.0.1-7
+- fix cancel button function in tool
+
 * Tue Jul 09 2024 Wenhua Huang <huangwenhua@kylinos.cn> - 1.0.1-6
 - add BuildRequires systemd
 
-- 
Gitee