tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

legend combined graph module view pandora_enterprise#8621

This commit is contained in:
Daniel Barbero Martin 2022-06-27 17:09:27 +02:00
parent beefbff267
commit d969ac42bf
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/ajax/graph.ajax.php
View File

@ -14,7 +14,7 @@ require_once 'include/functions_custom_graphs.php';
require_once 'include/functions_graph.php';
$save_custom_graph = (bool) get_parameter('save_custom_graph');
$print_custom_graph = (bool) get_parameter('print_custom_graph');
$print_custom_graph = (bool) get_parameter('print_custom_graph', false);
$print_sparse_graph = (bool) get_parameter('print_sparse_graph');
$get_graphs = (bool) get_parameter('get_graphs_container');
@ -52,13 +52,13 @@ if ($save_custom_graph) {
return;
}
if ($print_custom_graph) {
if ($print_custom_graph === true) {
ob_clean();
$width_value = (int) get_parameter('width', CHART_DEFAULT_WIDTH);
if ($width_value === -1) {
$width_value = '';
$width_value = '95%';
}
$params = [
@ -214,7 +214,7 @@ if ($get_graphs) {
];
$table .= grafico_modulo_sparse($params);
$contador --;
$contador--;
}
// $table .= "</br>";
@ -253,7 +253,7 @@ if ($get_graphs) {
$params_combined
);
$contador --;
$contador--;
}
break;
@ -323,7 +323,7 @@ if ($get_graphs) {
];
$table .= grafico_modulo_sparse($params);
$contador --;
$contador--;
}
}
break;

2
pandora_console/include/functions_graph.php
View File

@ -1444,7 +1444,7 @@ function graphic_combined_module(
array_push($modules, $modulepush);
array_push($weights, $source['weight']);
if ($source['label'] != '' || $params_combined['labels']) {
if (empty($source['label']) === false || $params_combined['labels']) {
$agent_description = agents_get_description($id_agent);
$agent_group = agents_get_agent_group($id_agent);
$agent_address = agents_get_address($id_agent);