From d59437f34ac80626290fe7570bce511bbb7c3200 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 23 Jan 2014 13:52:43 +0000 Subject: [PATCH] 2014-01-23 Miguel de Dios * godmode/reporting/visual_console_builder.editor.js, include/functions_visual_map.php, include/ajax/visual_console_builder.ajax.php: fixes the bug for the simple values positions and the enable links in the static graph. Incidents: #536 and #535 from local tracker git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9357 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 10 ++++++++++ .../reporting/visual_console_builder.editor.js | 11 ++++++++++- .../include/ajax/visual_console_builder.ajax.php | 1 + pandora_console/include/functions_visual_map.php | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 54e66221d9..c26d234594 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2014-01-23 Miguel de Dios + + * godmode/reporting/visual_console_builder.editor.js, + include/functions_visual_map.php, + include/ajax/visual_console_builder.ajax.php: fixes the bug for + the simple values positions and the enable links in the static + graph. + + Incidents: #536 and #535 from local tracker + 2014-01-22 Sergio Martin * godmode/alerts/alert_view.php: Add exception diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index d4a1c45500..8000a9520f 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -451,7 +451,16 @@ function loadFieldsFromDB(item) { $("input[name=label]").val(val); } - if (key == 'enable_link') $("input[name=enable_link]").val(val); + if (key == 'enable_link') { + if (val == "1") { + $("input[name=enable_link]") + .prop("checked", true); + } + else { + $("input[name=enable_link]") + .prop("checked", false); + } + } if (key == 'image') { //Load image preview diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php index 0bdba60f69..ea712cf0e8 100644 --- a/pandora_console/include/ajax/visual_console_builder.ajax.php +++ b/pandora_console/include/ajax/visual_console_builder.ajax.php @@ -576,6 +576,7 @@ switch ($action) { $values['label_color'] = $label_color; $values['parent_item'] = $parent; $values['no_link_color'] = 1; + $values['enable_link'] = $enable_link; switch ($type) { case 'module_graph': diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 6fe9365c3d..77f9a0fc1c 100644 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -210,7 +210,7 @@ function visual_map_print_item($layoutData) { case SIMPLE_VALUE_MIN: case SIMPLE_VALUE_AVG: $io_safe_output_text = io_safe_output($text); - echo '
'; + echo '
'; echo $io_safe_output_text; //Metaconsole db connection