tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-06-18 Dario Rodriguez <dario.rodriguez@artica.es> 

* 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
This commit is contained in:
darode 2012-06-18 15:58:41 +00:00
parent ee7084bf5a
commit f34cf1a37a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-06-18 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php: Fixed a bug which shows groups
that only have empty agents.
MERGED FROM 4.0.2
2012-06-18 Sergio Martin <sergio.martin@artica.es>
* include/functions_menu.php: Added missed sec2 to the menu

3
pandora_console/operation/tree.php
View File

@ -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();