From 54dd8cbc00433df12a460e45e11bd627dcf4e043 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Thu, 20 Dec 2012 12:24:21 +0000 Subject: [PATCH] 2012-12-20 Sergio Martin * include/functions_groups.php: Added missed translation of All group name * operation/events/events_list.php: Added compatibility on groups filter in events for metaconsole. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7316 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/include/functions_groups.php | 2 +- pandora_console/operation/events/events_list.php | 11 +++++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 9f5e27e613..2fd3da4150 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2012-12-20 Sergio Martin + + * include/functions_groups.php: Added missed translation of + All group name + + * operation/events/events_list.php: Added compatibility on groups + filter in events for metaconsole. + 2012-12-19 Ramon Novoa * godmode/agentes/module_manager_editor_common.php, diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php index 4c62b4a6c2..35dfe3a921 100644 --- a/pandora_console/include/functions_groups.php +++ b/pandora_console/include/functions_groups.php @@ -555,7 +555,7 @@ function groups_get_name ($id_group, $returnAllGroup = false) { if ($id_group > 0) return (string) db_get_value ('nombre', 'tgrupo', 'id_grupo', (int) $id_group); elseif($returnAllGroup) - return "All"; + return __("All"); } /** diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 95b78a3660..42474a5c97 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -151,8 +151,15 @@ $groups = users_get_groups($config['id_user'], 'IR'); //Group selection if ($ev_group > 0 && in_array ($ev_group, array_keys ($groups))) { - //If a group is selected and it's in the groups allowed - $sql_post = " AND id_grupo = $ev_group"; + if($meta) { + // In metaconsole the group search is performed by name + $group_name = groups_get_name ($ev_group); + $sql_post = " AND group_name = '$group_name'"; + } + else { + //If a group is selected and it's in the groups allowed + $sql_post = " AND id_grupo = $ev_group"; + } } else { if (is_user_admin ($config["id_user"])) {