From 817811ffac2ce997e93fdfc16f225bec7c7b2d1c Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 30 Nov 2023 10:13:18 +0100
Subject: [PATCH 1/2] fix error update manager pandora_enterprise#12447

---
 pandora_console/include/functions_menu.php                 | 3 ++-
 .../update_manager_client/lib/UpdateManager/Client.php     | 7 -------
 .../resources/javascript/umc_offline.js                    | 1 -
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 1df84f6025..3b4c092680 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -983,7 +983,8 @@ if (is_ajax()) {
                                 <th style="width: 60%; text-align: left; border: 0px;">
                                     <h1>'.$product_name.'</h1>
                                     <p><span>'.__('Version').' '.$pandora_version.$lts_name.' - '.(enterprise_installed() ? 'Enterprise' : 'Community').'</span></p>
-                                    <p><span>'.__('MR version').'</span> MR'.$config['MR'].'</p>
+                                    <p><span>'.__('Current package').'</span> '.$config['current_package'].'</p>
+                                    <p><span>'.__('MR version').'</span> MR'.$config['MR'].'</p>                                    
                                     <p><span>Build</span>'.$build_version.'</p>';
         if (enterprise_installed() === true) {
             $dialog .= '<p><span>'.__('Support expires').'</span>'.$license_expiry_date.'</p>';
diff --git a/pandora_console/update_manager_client/lib/UpdateManager/Client.php b/pandora_console/update_manager_client/lib/UpdateManager/Client.php
index a0ca625009..8abe5f2f83 100644
--- a/pandora_console/update_manager_client/lib/UpdateManager/Client.php
+++ b/pandora_console/update_manager_client/lib/UpdateManager/Client.php
@@ -1829,13 +1829,6 @@ class Client
             }
         } else {
             // Manually uploaded package.
-            if (is_numeric($package['version']) !== true) {
-                $this->lastError = 'Version does not match required format (numeric)';
-                $this->notify(10, $this->lastError, false);
-                $this->unlock();
-                return false;
-            }
-
             $classic_open_packages = false;
             $nextUpdate = [ 'version' => $package['version'] ];
             $file_path = $package['file_path'];
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 a32dfc1e5c..ad2432a306 100644
--- a/pandora_console/update_manager_client/resources/javascript/umc_offline.js
+++ b/pandora_console/update_manager_client/resources/javascript/umc_offline.js
@@ -487,7 +487,6 @@ function updateOfflineProgress(url, auth) {
  * Cancel update.
  */
 function cancelUpdate(reason = "") {
-  console.error(reason);
   var taskStatusLogContainer = $("#result li");
   taskStatusLogContainer.addClass("error");
   taskStatusLogContainer.find("p").text(texts.rejectedUpdate + " " + reason);

From f78c7495e5c3958b1f20b988e9647adc969f1cf5 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 14 Dec 2023 13:18:53 +0100
Subject: [PATCH 2/2] fixed modal close click button execute twice function
 close  pandora_enterprise#12447

---
 pandora_console/include/javascript/pandora_ui.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js
index 45ca47e92b..0ab678893d 100644
--- a/pandora_console/include/javascript/pandora_ui.js
+++ b/pandora_console/include/javascript/pandora_ui.js
@@ -583,7 +583,6 @@ function confirmDialog(settings, idDialog = uniqId()) {
           $(this).dialog("close");
           $(this).remove();
         }
-        if (typeof settings.onDeny == "function") settings.onDeny();
       }
     },
     {