diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.php b/pandora_console/godmode/reporting/visual_console_builder.editor.php index 9af06484ac..c9732c6cd4 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.php +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.php @@ -107,7 +107,8 @@ foreach ($layoutDatas as $layoutData) { visual_map_print_user_lines($layoutData); break; default: - visual_map_print_item("write", $layoutData); + visual_map_print_item("write", $layoutData, + null, true, false, false); break; } diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php index 11ae4a3f8c..b3dbb11096 100644 --- a/pandora_console/include/graphs/functions_flot.php +++ b/pandora_console/include/graphs/functions_flot.php @@ -202,7 +202,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend, } $return .= html_print_input_hidden ('lineWidhtGraph', $config['custom_graph_width'],true); $menu_width = 25 * $nbuttons + 15; - if ( $dashboard == false) { + if ( $dashboard == false AND $vconsole == false) { $return .= ""; + if ( $dashboard == false AND $vconsole == false ) + $return .= ""; if ($water_mark != '') { $return .= ""; diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php index d7ba3b8aac..adc148ee60 100755 --- a/pandora_console/operation/visual_console/render_view.php +++ b/pandora_console/operation/visual_console/render_view.php @@ -42,6 +42,7 @@ else { } $refr = (int) get_parameter ('refr', $config['vc_refr']); +$graph_javascript = (bool) get_parameter ('graph_javascript', false); $vc_refr = false; if (isset($config['vc_refr']) and $config['vc_refr'] != 0) @@ -153,7 +154,7 @@ else { html_print_input_hidden('metaconsole', 1); } -visual_map_print_visual_map ($id_layout, true, true, null, null, '', false, true); +visual_map_print_visual_map ($id_layout, true, true, null, null, '', false, $graph_javascript);