Some group acl fixes

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4527 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 4f6c74ad222822e01c7820524aa91fd97e63713e..a089e376c213d40a4067a728a323e966451614d4 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -145,11 +145,10 @@ class groupManagement extends plugin
       $this->dn= "new";
 
       /* Create new usertab object */
-      $this->grouptab= new grouptabs($this->config, $this->config->data['TABS']['GROUPTABS'], $this->dn);
+      $this->grouptab= new grouptabs($this->config, $this->config->data['TABS']['GROUPTABS'], $this->dn,"groups");
 
       /* Set up the users ACL's for this 'dn' */
-      $acl= get_permissions ($this->DivListGroup->selectedBase, $this->ui->subtreeACL);
-      $this->grouptab->set_acl($acl);
+      $this->grouptab->set_acl_base($this->DivListGroup->selectedBase);
     }
 
 
@@ -208,12 +207,9 @@ class groupManagement extends plugin
       }
       add_lock ($this->dn, $this->ui->dn);
 
-      /* Set up the users ACL's for this 'dn' */
-      $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
-
       /* Register grouptab to trigger edit dialog */
-      $this->grouptab= new grouptabs($this->config,$this->config->data['TABS']['GROUPTABS'], $this->dn);
-      $this->grouptab->set_acl($acl);
+      $this->grouptab= new grouptabs($this->config,$this->config->data['TABS']['GROUPTABS'], $this->dn,"groups");
+      $this->grouptab->set_acl_base($this->dn);
       $_SESSION['objectinfo']= $this->dn;
     }
 

diff --git a/plugins/admin/groups/tabs_group.inc b/plugins/admin/groups/tabs_group.inc
index 397557ed5d35b546eb765742cd2db493d5f173b3..7ae739b5c934c2e6b0248ad35324a438533c730a 100644 (file)
--- a/plugins/admin/groups/tabs_group.inc
+++ b/plugins/admin/groups/tabs_group.inc
@@ -3,9 +3,9 @@
 class grouptabs extends tabs
 {
 
-       function grouptabs($config, $data, $dn)
+       function grouptabs($config, $data, $dn,$acl_category)
        {
-               tabs::tabs($config, $data, $dn);
+               tabs::tabs($config, $data, $dn,$acl_category);
                $baseobject= $this->by_object['group'];
                foreach ($this->by_object as $name => $obj){
                        if(isset($obj->parent)){