From bc6a9069eb9593550b4e6bb75a05d5abf492fdda Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 28 Dec 2009 09:59:35 +0000 Subject: [PATCH] Updated acl listing -Display all assigned ACLs when "sub-search" is selected git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14954 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/plugins/admin/acl/class_filterACL.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gosa-core/plugins/admin/acl/class_filterACL.inc b/gosa-core/plugins/admin/acl/class_filterACL.inc index a74df2738..135e5198f 100644 --- a/gosa-core/plugins/admin/acl/class_filterACL.inc +++ b/gosa-core/plugins/admin/acl/class_filterACL.inc @@ -9,6 +9,9 @@ class filterACL { $flag= ($scope == "sub")?GL_SUBSEARCH:0; $result=array(); $result= array_merge($result,filterACL::get_list($base, $filter, $attributes, $category, array(), $flag | GL_SIZELIMIT, "cat")); + if($scope == "sub"){ + $result= array_merge($result,filterACL::get_list($base, $filter, $attributes, $category, array(), $flag | GL_SIZELIMIT, "search")); + } $result= array_merge($result,filterACL::get_list($base, $filter, $attributes, $category, $objectStorage, $flag | GL_SIZELIMIT, "")); return(filterACL::unifyResult($result)); } -- 2.30.2