tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-12447-errores-al-aplicar-parches' into 'develop' 

fix error update manager pandora_enterprise#12447

Closes pandora_enterprise#12447

See merge request artica/pandorafms!6721
This commit is contained in:
Rafael Ameijeiras 2023-12-14 14:36:36 +00:00
parent 60a2557878 f78c7495e5
commit 2420c79500
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/include/functions_menu.php
View File

@ -984,6 +984,7 @@ if (is_ajax()) {
<th style="width: 60%; text-align: left; border: 0px;"> <th style="width: 60%; text-align: left; border: 0px;">
<h1>'.$product_name.'</h1> <h1>'.$product_name.'</h1>
<p><span>'.__('Version').' '.$pandora_version.$lts_name.' - '.(enterprise_installed() ? 'Enterprise' : 'Community').'</span></p> <p><span>'.__('Version').' '.$pandora_version.$lts_name.' - '.(enterprise_installed() ? 'Enterprise' : 'Community').'</span></p>
<p><span>'.__('Current package').'</span> '.$config['current_package'].'</p>
<p><span>'.__('MR version').'</span> MR'.$config['MR'].'</p> <p><span>'.__('MR version').'</span> MR'.$config['MR'].'</p>
<p><span>Build</span>'.$build_version.'</p>'; <p><span>Build</span>'.$build_version.'</p>';
if (enterprise_installed() === true) { if (enterprise_installed() === true) {

1
pandora_console/include/javascript/pandora_ui.js
View File

@ -580,7 +580,6 @@ function confirmDialog(settings, idDialog = uniqId()) {
$(this).dialog("close"); $(this).dialog("close");
$(this).remove(); $(this).remove();
} }
if (typeof settings.onDeny == "function") settings.onDeny();
} }
}, },
{ {

7
pandora_console/update_manager_client/lib/UpdateManager/Client.php
View File

@ -1829,13 +1829,6 @@ class Client
} }
} else { } else {
// Manually uploaded package. // 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; $classic_open_packages = false;
$nextUpdate = [ 'version' => $package['version'] ]; $nextUpdate = [ 'version' => $package['version'] ];
$file_path = $package['file_path']; $file_path = $package['file_path'];

1
pandora_console/update_manager_client/resources/javascript/umc_offline.js
View File

@ -487,7 +487,6 @@ function updateOfflineProgress(url, auth) {
* Cancel update. * Cancel update.
*/ */
function cancelUpdate(reason = "") { function cancelUpdate(reason = "") {
console.error(reason);
var taskStatusLogContainer = $("#result li"); var taskStatusLogContainer = $("#result li");
taskStatusLogContainer.addClass("error"); taskStatusLogContainer.addClass("error");
taskStatusLogContainer.find("p").text(texts.rejectedUpdate + " " + reason); taskStatusLogContainer.find("p").text(texts.rejectedUpdate + " " + reason);