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

2013-12-19 Sergio Martin <sergio.martin@artica.es> 

* include/functions_visual_map.php: Fixed string simple 
	values in visual console for incident #463




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9245 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-12-19 17:21:02 +00:00
parent a246a62e1d
commit 3c748ac6b3
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2013-12-19 Sergio Martin <sergio.martin@artica.es>
* include/functions_visual_map.php: Fixed string simple
values in visual console for incident #463
2013-12-19 Sergio Martin <sergio.martin@artica.es>
* godmode/modules/manage_network_components_form.php: Fixed WMI

8
pandora_console/include/functions_visual_map.php
View File

@ -944,7 +944,6 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
$lines = array ();
foreach ($layout_datas as $layout_data) {
//Check the items are from disabled or pending delete modules
if ($layout_data['id_agente_modulo'] != 0 &&
(($layout_data['type'] != LABEL)
@ -1390,8 +1389,6 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
//TODO: change interface to add a period parameter, now is set to 1 day
switch ($layout_data['type']) {
case SIMPLE_VALUE:
//Metaconsole db connection
if ($layout_data['id_metaconsole'] != 0) {
$connection = db_get_row_filter ('tmetaconsole_setup',
@ -1410,8 +1407,11 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
metaconsole_restore_db();
}
// If the value is a string, dont format it
if (!is_string($value)) {
$value = format_for_graph($value, 2);
}
$value = format_for_graph($value, 2);
if (!empty($unit_text))
$value .= " " . $unit_text;
break;