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

2014-06-03 Vanessa Gil <vanessa.gil@artica.es> 

* 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
This commit is contained in:
vgilc 2014-06-03 11:52:46 +00:00
parent 775aadd7ed
commit 4ab5a7de72
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2014-06-03 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_groups.php: Fixed problem
with ACLs in group view.
2014-06-03 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_visual_map.php: Now the linked visual

8
pandora_console/include/functions_groups.php
View File

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