From f95fc2b2df5915bc4ca0f1ee0d0d3b187597a045 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Wed, 7 Sep 2022 16:13:48 +0200
Subject: [PATCH 1/2] #9269 Fixed result update
---
.../resources/javascript/umc_offline.js | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pandora_console/update_manager_client/resources/javascript/umc_offline.js b/pandora_console/update_manager_client/resources/javascript/umc_offline.js
index 5618411b28..7150a58597 100644
--- a/pandora_console/update_manager_client/resources/javascript/umc_offline.js
+++ b/pandora_console/update_manager_client/resources/javascript/umc_offline.js
@@ -427,6 +427,11 @@ function install_package(url, auth, packageId, version, serverUpdate) {
$("#input-progress")
.val(100)
.change();
+
+ $("#result li").removeClass("error");
+ $("#result li")
+ .find("p")
+ .text(response.result);
},
error: function(e, request) {
clearInterval(progressInterval);
From 28b31d730d21172bc4c04e89c49365e519359f5b Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Thu, 22 Sep 2022 11:44:41 +0200
Subject: [PATCH 2/2] #9269 Fixed deny
---
.../resources/javascript/umc_offline.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pandora_console/update_manager_client/resources/javascript/umc_offline.js b/pandora_console/update_manager_client/resources/javascript/umc_offline.js
index 7150a58597..027908ded7 100644
--- a/pandora_console/update_manager_client/resources/javascript/umc_offline.js
+++ b/pandora_console/update_manager_client/resources/javascript/umc_offline.js
@@ -395,6 +395,7 @@ function formatFileSize(bytes) {
* @param {boolean} serverUpdate
*/
function install_package(url, auth, packageId, version, serverUpdate) {
+ var processed = 0;
umConfirm({
message:
(serverUpdate ? texts.ensureServerUpdate : texts.ensureUpdate) +
@@ -442,7 +443,10 @@ function install_package(url, auth, packageId, version, serverUpdate) {
});
},
onDeny: function() {
- cancelUpdate();
+ if (processed >= 1) {
+ cancelUpdate();
+ }
+ processed += 1;
}
});
}