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

Fixed custom graphs when include new type of graphs. 

(cherry picked from commit f7c2d45210)
This commit is contained in:
m-lopez-f 2015-11-06 10:34:11 +01:00
parent 756b7ebef2
commit 7c68b6eeff
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pandora_console/include/ajax/visual_console_builder.ajax.php
View File

@ -787,8 +787,27 @@ switch ($action) {
break; break;
case 'module_graph': case 'module_graph':
$values['type'] = MODULE_GRAPH; $values['type'] = MODULE_GRAPH;
$values['height'] = $height_module_graph; if ($values['id_custom_graph'] > 0 ) {
$values['width'] = $width_module_graph; $values['height'] = $height_module_graph;
$values['width'] = $width_module_graph;
$graph_conf = db_get_row('tgraph', 'id_graph', $values['id_custom_graph']);
$graph_stacked = $graph_conf['stacked'];
if ( $graph_stacked == CUSTOM_GRAPH_BULLET_CHART) {
$values['height'] = 50;
}
elseif ($graph_stacked == CUSTOM_GRAPH_GAUGE ){
if ( $height_module_graph < 150 )
$values['height'] = 150;
elseif( $height_module_graph >= 150 && $height_module_graph < 250 )
$values['height'] = $graph_height;
elseif( $height_module_graph >= 250 )
$values['height'] = 200;
}
} else {
$values['height'] = $height_module_graph;
$values['width'] = $width_module_graph;
}
$values['period'] = $period; $values['period'] = $period;
break; break;
case 'percentile_item': case 'percentile_item':