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-10451-no-se-puede-actualizar-a-la-769-server-por-update-manager-offline-en-centos-7' into 'develop' 

Ent 10451 no se puede actualizar a la 769 server por update manager offline en centos 7

See merge request artica/pandorafms!5606
This commit is contained in:
Daniel Rodriguez 2023-03-30 13:10:32 +00:00
parent 9344bd16c9 4b3bf70eb5
commit 3e51586738
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/update_manager_client/lib/UpdateManager/UI/Manager.php
View File

@ -623,7 +623,9 @@ class Manager
if ($server_update === false) {
$return['files'] = Client::checkOUMContent($file_path);
} else {
$return['files'] = Client::checkTGZContent($file_path);
// Commented line for memory limit problems.
// $return['files'] = Client::checkTGZContent($file_path);
$return['files'] = null;
}
if (session_status() !== PHP_SESSION_ACTIVE) {

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

@ -172,18 +172,21 @@ function form_upload(url, auth, current_package) {
log_zone.html("<div>" + texts.uploadSuccess + "</div>");
log_zone.append("<div>" + texts.uploadMessage + "</div>");
log_zone.append("<div>" + texts.clickToStart + "</div>");
var file_list =
"<h2>" + texts.fileList + "</h2><div class='file_list'>";
if (res.files) {
res.files.forEach(function(e) {
file_list += "<div class='file_entry'>" + e + "</div>";
});
if (res.files !== null) {
var file_list =
"<h2>" + texts.fileList + "</h2><div class='file_list'>";
if (res.files) {
res.files.forEach(function(e) {
file_list += "<div class='file_entry'>" + e + "</div>";
});
}
file_list += "</div>";
log_zone.append(file_list);
}
file_list += "</div>";
log_zone.append(file_list);
// Show messages
$("#log_zone").slideDown(400, function() {
$("#log_zone").height(200);