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-6604-Perdida-de-conexion-con-el-servidor-en-consolas-visuales-con-link-publico-y-autorefresco' into 'develop' 

fixed connection check in public link of visual consoles

See merge request artica/pandorafms!3573
This commit is contained in:
Daniel Rodriguez 2020-10-27 15:58:13 +01:00
parent e2abe65035 7c882d3723
commit 8ea3a5a578
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/javascript/pandora.js
View File

@ -2024,7 +2024,7 @@ function getServerUrl() {
server_url = get_php_value("homeurl"); server_url = get_php_value("homeurl");
} catch (SyntaxError) { } catch (SyntaxError) {
console.warn("Pandora homeurl cannot be found."); console.warn("Pandora homeurl cannot be found.");
server_url = window.location.origin + "/pandora_console"; server_url = $("#hidden-homeurl").val();
} }
return server_url; return server_url;
} }

2
pandora_console/operation/visual_console/legacy_public_view.php
View File

@ -43,6 +43,8 @@ enterprise_include('index.php');
$url_css = ui_get_full_url('include/styles/visual_maps.css', false, false, false); $url_css = ui_get_full_url('include/styles/visual_maps.css', false, false, false);
echo '<link rel="stylesheet" href="'.$url_css.'" type="text/css" />'; echo '<link rel="stylesheet" href="'.$url_css.'" type="text/css" />';
html_print_input_hidden('homeurl', $config['homeurl']);
$url_css_modal = ui_get_full_url('include/styles/register.css', false, false, false); $url_css_modal = ui_get_full_url('include/styles/register.css', false, false, false);
echo '<link rel="stylesheet" href="'.$url_css_modal.'" type="text/css" />'; echo '<link rel="stylesheet" href="'.$url_css_modal.'" type="text/css" />';
// Connection lost alert. // Connection lost alert.

2
pandora_console/operation/visual_console/public_view.php
View File

@ -31,6 +31,8 @@ require_once $config['homedir'].'/vendor/autoload.php';
ui_require_css_file('visual_maps'); ui_require_css_file('visual_maps');
ui_require_css_file('register'); ui_require_css_file('register');
html_print_input_hidden('homeurl', $config['homeurl']);
// Connection lost alert. // Connection lost alert.
$conn_title = __('Connection with server has been lost'); $conn_title = __('Connection with server has been lost');
$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');