From 89727824a4c9b4d93ac1797cb1a39ad66d3c9fa5 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Fri, 17 Mar 2017 13:56:38 +0100 Subject: [PATCH] Fixed error in um online open --- .../include/ajax/update_manager.ajax.php | 5 ++- .../include/javascript/update_manager.js | 31 ++----------------- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/pandora_console/include/ajax/update_manager.ajax.php b/pandora_console/include/ajax/update_manager.ajax.php index 4d75207d7b..a89e5b8e4b 100644 --- a/pandora_console/include/ajax/update_manager.ajax.php +++ b/pandora_console/include/ajax/update_manager.ajax.php @@ -378,7 +378,6 @@ if ($search_minor) { if ($update_last_free_package) { $package = get_parameter('package', ''); $version = get_parameter('version', ''); - $accept = (boolean)get_parameter('accept', false); $package_url = base64_decode($package); $params = array('action' => 'get_package', @@ -520,6 +519,8 @@ if ($unzip_free_package) { } echo json_encode($return); + + return; } if ($install_free_package) { @@ -540,5 +541,7 @@ if ($install_free_package) { } echo json_encode($return); + + return; } ?> diff --git a/pandora_console/include/javascript/update_manager.js b/pandora_console/include/javascript/update_manager.js index 6a0cf05699..c6a187d189 100644 --- a/pandora_console/include/javascript/update_manager.js +++ b/pandora_console/include/javascript/update_manager.js @@ -1313,34 +1313,9 @@ function install_free_package_prev_step(package, version, homeurl) { $('#cancel_pkg').html(dialog_cancel_pkg_text); $('#cancel_pkg').dialog('open'); - var parameters = {}; - parameters['page'] = 'include/ajax/update_manager.ajax'; - parameters['update_last_free_package'] = 1; - parameters['package'] = package; - parameters['version'] = version; - parameters['accept'] = 0; - - jQuery.post( - home_url + "ajax.php", - parameters, - function (data) { - if (data['in_progress']) { - $("#box_online .loading").hide(); - $("#box_online .download_package").hide(); - - $("#box_online .content").html(data['message']); - - install_free_package(package, version, homeurl); - setTimeout(function () { - check_progress_update(homeurl); - }, 1000); - } - else { - $("#box_online .content").html(data['message']); - } - }, - "json" - ); + $("#box_online .loading").hide(); + $("#box_online .progressbar").hide(); + $("#box_online .content").html(package_cancel); } } });