tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 09:15:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-3377-Bug_Manager_Update_Online_de_la_version_OpenSource' into 'develop'

Browse Source 
Ent 3377 bug manager update online de la version open source

See merge request artica/pandorafms!2171

Former-commit-id: f353173953ab39af5bd6e1f39d41e37c7476618a
This commit is contained in:
Daniel Rodriguez 2019-02-13 15:56:19 +01:00
commit f7134b6d81
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/godmode/update_manager/update_manager.online.php
View File

@ -140,8 +140,8 @@ if ($enterprise == ENTERPRISE_NOT_HOOK) {
?> ?>
<script> <script>
var open = "<?php echo $open; ?>"; var isopen = "<?php echo $open; ?>";
if(open){ if(isopen){
$(document).ready(function() { $(document).ready(function() {
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" ); $('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
jQuery.post ("ajax.php", jQuery.post ("ajax.php",
@ -150,6 +150,7 @@ if(open){
"message":"infomodal"}, "message":"infomodal"},
function (data, status) { function (data, status) {
$("#alert_messages").hide () $("#alert_messages").hide ()
.css ("opacity", 1)
.empty () .empty ()
.append (data) .append (data)
.show (); .show ();

2
pandora_console/include/functions_update_manager.php
View File

@ -711,7 +711,7 @@ function update_manager_extract_package()
rrmdir($path_package); rrmdir($path_package);
if ($result != 0) { if ($result == 0) {
db_process_sql_update( db_process_sql_update(
'tconfig', 'tconfig',
[ [

6
pandora_console/include/javascript/update_manager.js
View File

@ -1312,7 +1312,7 @@ function update_last_package(package, version, homeurl) {
$("#box_online .content").html(""); $("#box_online .content").html("");
$("#box_online .loading").show(); $("#box_online .loading").show();
$("#box_online .download_package").show(); $("#box_online .downloading_package").show();
var parameters = {}; var parameters = {};
parameters["page"] = "include/ajax/update_manager.ajax"; parameters["page"] = "include/ajax/update_manager.ajax";
@ -1326,7 +1326,7 @@ function update_last_package(package, version, homeurl) {
parameters, parameters,
function(data) { function(data) {
if (data["in_progress"]) { if (data["in_progress"]) {
$("#box_online .download_package").hide(); $("#box_online .downloading_package").hide();
$("#box_online .content").html(data["message"]); $("#box_online .content").html(data["message"]);
@ -1341,7 +1341,7 @@ function update_last_package(package, version, homeurl) {
parameters2, parameters2,
function(data) { function(data) {
if (data["correct"]) { if (data["correct"]) {
$("#box_online .download_package").hide(); $("#box_online .downloading_package").hide();
$("#box_online .content").html(data["message"]); $("#box_online .content").html(data["message"]);