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-11960-metaconsola-widgets-data-matrix-latest-events-modules-by-status-no-cargan' into 'develop' 

Ent 11960 metaconsola widgets data matrix latest events modules by status no cargan

See merge request artica/pandorafms!6366
This commit is contained in:
Gorka Sanchez 2023-08-31 06:40:41 +00:00
parent 79857d6b71 17bfcba735
commit f2f8038d99
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pandora_console/include/functions_ui.php
View File

@ -4165,11 +4165,7 @@ function ui_print_datatable(array $parameters)
$parameters['dataElements'] = json_encode($parameters['data_element']); $parameters['dataElements'] = json_encode($parameters['data_element']);
// * START JAVASCRIPT. // * START JAVASCRIPT.
if (is_metaconsole() === false) { $file_path = $config['homedir'].'/include/javascript/datatablesFunction.js';
$file_path = 'include/javascript/datatablesFunction.js';
} else {
$file_path = '../../include/javascript/datatablesFunction.js';
}
$file_content = file_get_contents($file_path); $file_content = file_get_contents($file_path);
$json_data = json_encode($parameters); $json_data = json_encode($parameters);
@ -4229,18 +4225,17 @@ function ui_print_datatable(array $parameters)
false false
); );
$output .= '?v='.$config['current_package'].'"/>'; $output .= '?v='.$config['current_package'].'"/>';
if (is_metaconsole() === true) { // if (is_metaconsole() === true) {
// Load meta_tables.css. // Load meta_tables.css.
$output .= '<link rel="stylesheet" href="'; // $output .= '<link rel="stylesheet" href="';
$output .= ui_get_full_url( // $output .= ui_get_full_url(
ENTERPRISE_DIR.'/include/styles/meta_tables.css', // ENTERPRISE_DIR.'/include/styles/meta_tables.css',
false, // false,
false, // false,
false // false
); // );
$output .= '?v='.$config['current_package'].'"/>'; // $output .= '?v='.$config['current_package'].'"/>';
} // }
// Load datatables.js. // Load datatables.js.
$output .= '<script src="'; $output .= '<script src="';
$output .= ui_get_full_url( $output .= ui_get_full_url(

2
pandora_console/include/graphs/functions_flot.php
View File

@ -39,7 +39,7 @@ function include_javascript_dependencies_flot_graph($return=false, $mobile=false
$output .= ' $output .= '
<script type="text/javascript"> <script type="text/javascript">
var phpTimezone = "'.date_default_timezone_get().'"; var phpTimezone = "'.date_default_timezone_get().'";
var configHomeurl = "'.$config['homeurl'].'"; var configHomeurl = "'.((is_metaconsole() === false) ? $config['homeurl'] : '../../').'";
</script>'; </script>';
// NOTE: jquery.flot.threshold is not te original file. Is patched to allow multiple thresholds and filled area // NOTE: jquery.flot.threshold is not te original file. Is patched to allow multiple thresholds and filled area