From 4ab5a7de726c4fce1a2951b250779759a1f06ec3 Mon Sep 17 00:00:00 2001 From: vgilc Date: Tue, 3 Jun 2014 11:52:46 +0000 Subject: [PATCH] 2014-06-03 Vanessa Gil * include/functions_groups.php: Fixed problem with ACLs in group view. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10092 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ pandora_console/include/functions_groups.php | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2c9379d204..33a1177ec8 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2014-06-03 Vanessa Gil + + * include/functions_groups.php: Fixed problem + with ACLs in group view. + 2014-06-03 Alejandro Gallardo * include/functions_visual_map.php: Now the linked visual diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php index d5cc5db349..74f4cf4cc8 100644 --- a/pandora_console/include/functions_groups.php +++ b/pandora_console/include/functions_groups.php @@ -247,9 +247,13 @@ function groups_get_childrens($parent, $groups = null) { if ($group['id_grupo'] == 0) { continue; } - if ($group['parent'] == $parent) { - $return = $return + array($group['id_grupo'] => $group) + groups_get_childrens($group['id_grupo'], $groups); + + if ($group['propagate']) { + if ($group['parent'] == $parent) { + $return = $return + array($group['id_grupo'] => $group) + groups_get_childrens($group['id_grupo'], $groups); + } } + } return $return;