From 8f4bae5b6345433a1644801021d7c9155a8b059a Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 16 Jul 2008 13:35:28 +0000 Subject: [PATCH] Updated department acls - Fixed order of department object ACLs. - Fixed Tab initiaization git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11687 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../departments/class_countryGeneric.inc | 9 ++---- .../admin/departments/class_dcObject.inc | 6 ++-- .../class_departmentManagement.inc | 2 +- .../departments/class_localityGeneric.inc | 9 ++---- .../departments/class_organizationGeneric.inc | 28 +++++-------------- 5 files changed, 16 insertions(+), 38 deletions(-) diff --git a/gosa-core/plugins/admin/departments/class_countryGeneric.inc b/gosa-core/plugins/admin/departments/class_countryGeneric.inc index 3bf6f2f80..32e2ad761 100644 --- a/gosa-core/plugins/admin/departments/class_countryGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_countryGeneric.inc @@ -83,13 +83,10 @@ class country extends department "plCategory" => array("department"), "plProvidedAcls" => array( -# "searchGuide" => _("Search guide"), -# "seeAlso" => _("See also"), - "street" => _("Street"), - "base" => _("Base"), - "gosaUnitTag" => _("Administrative settings"), + "c" => _("Country name"), "description" => _("Description"), - "c" => _("Country name")), + "base" => _("Base"), + "gosaUnitTag" => _("Administrative settings")) )); } } diff --git a/gosa-core/plugins/admin/departments/class_dcObject.inc b/gosa-core/plugins/admin/departments/class_dcObject.inc index dd7d053f4..8c4916d3a 100644 --- a/gosa-core/plugins/admin/departments/class_dcObject.inc +++ b/gosa-core/plugins/admin/departments/class_dcObject.inc @@ -82,10 +82,10 @@ class dcObject extends department "plCategory" => array("department"), "plProvidedAcls" => array( - "base" => _("Base"), - "gosaUnitTag" => _("Administrative settings"), + "dc" => _("Name"), "description" => _("Description"), - "dc" => _("Name")), + "base" => _("Base"), + "gosaUnitTag" => _("Administrative settings")) )); } } diff --git a/gosa-core/plugins/admin/departments/class_departmentManagement.inc b/gosa-core/plugins/admin/departments/class_departmentManagement.inc index b2ef6df43..a5e1e3945 100644 --- a/gosa-core/plugins/admin/departments/class_departmentManagement.inc +++ b/gosa-core/plugins/admin/departments/class_departmentManagement.inc @@ -125,7 +125,7 @@ class departmentManagement extends plugin if(isset($types[$type])){ $tab = $types[$type]['TAB']; $acl = $types[$type]['ACL']; - $this->deptabs= new deptabs($this->config,$this->config->data['TABS'][$tab], $this->dn,$acl); + $this->deptabs= new deptabs($this->config,$this->config->data['TABS'][$tab], $this->dn,"department"); $this->deptabs->set_acl_base($this->DivListDepartment->selectedBase); }else{ trigger_error("Invalid / Not implemented countainer type."); diff --git a/gosa-core/plugins/admin/departments/class_localityGeneric.inc b/gosa-core/plugins/admin/departments/class_localityGeneric.inc index f5f895cda..bf4dd26f5 100644 --- a/gosa-core/plugins/admin/departments/class_localityGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_localityGeneric.inc @@ -83,15 +83,10 @@ class locality extends department "plCategory" => array("department"), "plProvidedAcls" => array( - - - - "description" => _("Description"), "l" => _("Location"), - "st" => _("State"), - + "description" => _("Description"), "base" => _("Base"), - "gosaUnitTag" => _("Administrative settings")), + "gosaUnitTag" => _("Administrative settings")) )); } } diff --git a/gosa-core/plugins/admin/departments/class_organizationGeneric.inc b/gosa-core/plugins/admin/departments/class_organizationGeneric.inc index f8f1fcb54..c9ee62a76 100644 --- a/gosa-core/plugins/admin/departments/class_organizationGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_organizationGeneric.inc @@ -114,32 +114,18 @@ class organization extends department "plCategory" => array("department"), "plProvidedAcls" => array( -# "userPassword" => _("Password"), -# "searchGuide" => _("Search guide"), -# "seeAlso" => _("See also"), -# "x121Address" => _("No idea"), -# "registeredAddress" => _("Registered address"), -# "teletexTerminalIdentifier" => _("Teletext terminal identifier"), -# "physicalDeliveryOfficeName" => _("Physical delivery office name"), -# "internationaliSDNNumber" => _("International ISDN number"), -# "preferredDeliveryMethod" => _("Prefered delivery mode"), -# "telexNumber" => _("Telex number"), - - "o" => _("Organization name"), "description" => _("Description"), - "destinationIndicator" => _("Destination indicator"), - "telephoneNumber" => _("Phone number"), - "street" => _("Street"), - "postOfficeBox" => _("Post office box "), - "postalCode" => _("Postal code"), - "postalAddress" => _("Postal address"), - "base" => _("Base"), "businessCategory" => _("Category"), + "base" => _("Base"), + "st" => _("State"), "l" => _("Location"), - "gosaUnitTag" => _("Administrative settings"), - "facsimileTelephoneNumber"=> _("Fax")) + "postalAddress" => _("Postal address"), + "telephoneNumber" => _("Phone number"), + "facsimileTelephoneNumber"=> _("Fax"), + + "gosaUnitTag" => _("Administrative settings")) )); } -- 2.30.2