diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 0c38aebe33..232613c5bf 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2009-12-17 Miguel de Dios <miguel.dedios@artica.es> + + * pandora_console/godmode/reporting/graph_builder.php: fix blank row when + redraw graph in builder, and fix the empty column agent name in table of + modules. + Fixes: 2916194 + 2009-12-17 Miguel de Dios <miguel.dedios@artica.es> * pandora_console/extensions/update_manager/load_updatemanager.php: add more diff --git a/pandora_console/godmode/reporting/graph_builder.php b/pandora_console/godmode/reporting/graph_builder.php index 85db06d3dc..b9558bae8a 100644 --- a/pandora_console/godmode/reporting/graph_builder.php +++ b/pandora_console/godmode/reporting/graph_builder.php @@ -195,21 +195,22 @@ if (isset ($_GET["delete_module"] )) { if ($add_module) { if ($editGraph) { - $id = get_parameter('id'); $id_module = get_parameter('id_module'); - $factor = get_parameter('factor'); - process_sql_insert('tgraph_source', array('id_graph' => $id, 'id_agent_module' => $id_module, 'weight' => $factor)); - - $period = get_parameter('period'); - $width = get_parameter('width'); - $height = get_parameter('height'); - $events = get_parameter('events'); - $stacked = get_parameter('stacked'); - - process_sql_update('tgraph', array('period' => $period, - 'width' => $width, 'height' => $height, 'events' => $events, - 'stacked' => $stacked), array('id_graph' => $id)); + if ($id_module != -1) { + $factor = get_parameter('factor'); + process_sql_insert('tgraph_source', array('id_graph' => $id, 'id_agent_module' => $id_module, 'weight' => $factor)); + + $period = get_parameter('period'); + $width = get_parameter('width'); + $height = get_parameter('height'); + $events = get_parameter('events'); + $stacked = get_parameter('stacked'); + + process_sql_update('tgraph', array('period' => $period, + 'width' => $width, 'height' => $height, 'events' => $events, + 'stacked' => $stacked), array('id_graph' => $id)); + } } else { $id_agent = $_POST["id_agent"]; @@ -345,8 +346,7 @@ if (isset ($chunk1)) { $color = 1; } - echo "<tr><td class='$tdcolor'>"; - echo get_agent_name ($agent_array[$a])."</td>"; + echo "<tr><td class='$tdcolor'>" . $agent_array[$a] . "</td>"; echo "<td class='$tdcolor'>"; echo get_agentmodule_name ($module_array[$a])."</td>"; echo "<td class='$tdcolor'>";