From bbf1d0516f6565c840d3500f1912a69d11a29e1a Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 29 Aug 2006 03:56:20 +0000 Subject: [PATCH] Some group acl fixes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4527 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/groups/class_groupManagement.inc | 12 ++++-------- plugins/admin/groups/tabs_group.inc | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc index 4f6c74ad2..a089e376c 100644 --- 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 397557ed5..7ae739b5c 100644 --- 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)){ -- 2.30.2