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:
commit
2420c79500
|
@ -984,7 +984,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>';
|
||||
|
|
|
@ -580,7 +580,6 @@ function confirmDialog(settings, idDialog = uniqId()) {
|
|||
$(this).dialog("close");
|
||||
$(this).remove();
|
||||
}
|
||||
if (typeof settings.onDeny == "function") settings.onDeny();
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
@ -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'];
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue