diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 1dc099621d..08cdd5f685 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2012-04-11 Juan Manuel Ramon + + * godmode/groups/group_list.php + godmode/reporting/graph_builder.graph_editor.php: Reverted some + modifications in custom graphs metaconsole compatibility. + 2012-04-11 Sergio Martin * godmode/massive/massive_delete_modules.php: Fixed a diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index b27b9507cd..e68d166379 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -86,7 +86,7 @@ if (is_ajax ()) { $filter['string'] = $search; } - if ($config['metaconsole'] == 1) { + /*if ($config['metaconsole'] == 1) { enterprise_include_once('include/functions_metaconsole.php'); $connection_names = enterprise_hook('metaconsole_get_connection_names'); @@ -114,9 +114,9 @@ if (is_ajax ()) { enterprise_hook('metaconsole_restore_db'); } } - else { + else { */ $agents = agents_get_group_agents ($id_group, $filter, "none", false, $recursion); - } + //} echo json_encode ($agents); return; diff --git a/pandora_console/godmode/reporting/graph_builder.graph_editor.php b/pandora_console/godmode/reporting/graph_builder.graph_editor.php index e87fd9e03f..25b9219448 100644 --- a/pandora_console/godmode/reporting/graph_builder.graph_editor.php +++ b/pandora_console/godmode/reporting/graph_builder.graph_editor.php @@ -129,7 +129,7 @@ echo ""; echo "".__('Modules').""; echo ""; // If metaconsole is activated -if ($config['metaconsole'] == 1) { +/*if ($config['metaconsole'] == 1) { enterprise_include_once('include/functions_metaconsole.php'); $connection_names = enterprise_hook('metaconsole_get_connection_names'); @@ -160,9 +160,9 @@ if ($config['metaconsole'] == 1) { echo "".html_print_select ($agents, 'id_agents[]', 0, false, '', '', true, true, true, '', false, 'width:200px;').""; } -else { +else {*/ echo "".html_print_select (agents_get_group_agents(), 'id_agents[]', 0, false, '', '', true, true, true, '', false, 'width:200px;').""; -} +//} echo "" . html_print_image("images/darrowright.png", true) . ""; echo "".html_print_select (array (), 'module[]', 0, false, '', 0, true, true, true, '', false, 'width:200px;').""; echo "";