Merge branch 'develop' of github.com:pandorafms/pandorafms into develop

This commit is contained in:
mdtrooper 2014-09-26 13:10:43 +02:00
commit 2c0ac5d4e9
1 changed files with 9 additions and 2 deletions

View File

@ -592,9 +592,16 @@ function treeview_getData ($type) {
$search_free = get_parameter('search_free', '');
$select_status = get_parameter('status', -1);
$search_group = get_parameter('search_group', 0);
if ($search_group) {
$avariableGroups[$search_group] = groups_get_name($search_group);
} else {
$avariableGroups = users_get_groups ();
}
//Get all groups
$avariableGroups = users_get_groups ();
//$avariableGroups = users_get_groups ();
//Get all groups with agents
$full_groups = db_get_all_rows_sql("