From 6e49325c754cea6126264c03988e58f149892a22 Mon Sep 17 00:00:00 2001 From: darode Date: Mon, 18 Jun 2012 15:58:41 +0000 Subject: [PATCH] 2012-06-18 Dario Rodriguez * operation/tree.php: Fixed a bug which shows groups that only have empty agents. MERGED FROM 4.0.2 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6580 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/operation/tree.php | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index cedccd7840..1a714ed62f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2012-06-18 Dario Rodriguez + + * operation/tree.php: Fixed a bug which shows groups + that only have empty agents. + + MERGED FROM 4.0.2 + 2012-06-18 Sergio Martin * include/functions_menu.php: Added missed sec2 to the menu diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index 3e6c6db402..0648a8eda9 100644 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -735,7 +735,8 @@ function printTree_($type) { $avariableGroups = users_get_groups (); //db_get_all_rows_in_table('tgrupo', 'nombre'); //Get all groups with agents - $full_groups = db_get_all_rows_sql("SELECT DISTINCT id_grupo FROM tagente"); + $full_groups = db_get_all_rows_sql("SELECT DISTINCT tagente.id_grupo FROM tagente, tagente_estado WHERE + tagente.id_agente = tagente_estado.id_agente AND tagente_estado.utimestamp != 0"); $fgroups = array();