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

diff --git a/gosa-core/plugins/admin/acl/class_filterACL.inc b/gosa-core/plugins/admin/acl/class_filterACL.inc
index a74df2738f6fdf1d5f650bdc0c91d86a675501b3..135e5198f8862b4c388563f2a30dc324b0309fb5 100644 (file)
--- 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));
   }