From db1f7342d8a701c416d6bcdf544d6c90e5b3f6a3 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 22 May 2013 15:08:24 +0000 Subject: [PATCH] 2013-05-22 Miguel de Dios * godmode/reporting/visual_console_builder.editor.js: fixed the update the module graph item. Fixes: #2234 * godmode/reporting/visual_console_builder.php: fixed lost height and width of item when add several module graphs. MERGED FROM THE BRANCH 4 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8190 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 12 ++++++++++++ .../reporting/visual_console_builder.editor.js | 1 + .../godmode/reporting/visual_console_builder.php | 5 +++++ 3 files changed, 18 insertions(+) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 278fca24e5..e27777d532 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2013-05-22 Miguel de Dios + + * godmode/reporting/visual_console_builder.editor.js: fixed the + update the module graph item. + + Fixes: #2234 + + * godmode/reporting/visual_console_builder.php: fixed lost height + and width of item when add several module graphs. + + MERGED FROM THE BRANCH 4 + 2013-05-22 Hirofumi Kosaka * pandoradb.sql: (workaround to avoid mysql's warning diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index f40d851f8e..ca44f3cb2f 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -1233,6 +1233,7 @@ function updateDB_visual(type, idElement , values, event, top, left) { switch (type) { case 'module_graph': $("#image_" + idElement).attr("src", getModuleGraph(idElement)); + break; case 'static_graph': if ((event != 'resizestop') && (event != 'show_grid') && (event != 'dragstop')) { diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php index 103468fa7c..2fd917ce0c 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.php +++ b/pandora_console/godmode/reporting/visual_console_builder.php @@ -235,6 +235,11 @@ switch ($activeTab) { $message = ''; + if (($width == 0) && ($height == 0) && ($type == MODULE_GRAPH)) { + $width = 300; + $height = 180; + } + // One item per agent if ($item_per_agent == 1) { $id_agents_result = array();