diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 396505d4c9..5b54017596 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2013-10-14 Miguel de Dios + + * operation/agentes/status_monitor.php: fixed the filter by group + in the metaconsole. + 2013-10-14 Ramon Novoa * operation/snmpconsole/snmp_view.php: Made the SNMP trap viewer look diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index b8c849dc94..b2393cf13b 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -47,7 +47,14 @@ else { $ag_freestring = get_parameter ('ag_freestring'); $ag_modulename = (string) get_parameter ('ag_modulename'); -$ag_group = (int) get_parameter ('ag_group', 0); +if (!defined('METACONSOLE')) { + $ag_group = (int) get_parameter ('ag_group', 0); +} +else { + $ag_group = get_parameter ('ag_group', 0); + $ag_group_metaconsole = $ag_group; +} + $offset = (int) get_parameter ('offset', 0); $status = (int) get_parameter ('status', 4); $modulegroup = (int) get_parameter ('modulegroup', -1); @@ -180,7 +187,7 @@ $groups = users_get_groups($config["id_user"]); $sql_conditions_tags = tags_get_acl_tags($config['id_user'], array_keys($groups), 'AR', 'module_condition', 'AND', 'tagente_modulo'); -if(is_numeric($sql_conditions_tags)) { +if (is_numeric($sql_conditions_tags)) { $sql_conditions_tags = ' AND 1 = 0'; } @@ -330,6 +337,9 @@ if (defined('METACONSOLE')) { metaconsole_restore_db(); } unset($groups_select[__('All')]); + $key_group_all = array_search(__('All'), $groups_select); + if ($key_group_all !== false) + unset($groups_select[$key_group_all]); } if (!defined('METACONSOLE')) { @@ -341,12 +351,12 @@ if (!defined('METACONSOLE')) { false, 'width:150px;') . ' '; } -else { +else { echo ' ' . __('Group') . ' ' . html_print_select($groups_select, "ag_group", - io_safe_output($ag_group), '', __('All'), '0', true, false, false, 'w130', + io_safe_output($ag_group_metaconsole), '', __('All'), '0', true, false, false, 'w130', false, 'width:150px;') . ' '; }