From e3feb0d7b7a285bc3f50381e7dd521f98ff6c13d Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 24 Jun 2008 13:26:14 +0000 Subject: [PATCH] Updated departments -Added ACL info to each dep type. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11420 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../departments/class_countryGeneric.inc | 22 +++++++++++++ .../departments/class_localityGeneric.inc | 33 ++++++++++++++++--- .../departments/class_organizationGeneric.inc | 2 +- .../plugins/admin/departments/country.tpl | 3 +- .../plugins/admin/departments/locality.tpl | 3 +- .../admin/departments/organization.tpl | 1 + 6 files changed, 57 insertions(+), 7 deletions(-) diff --git a/gosa-core/plugins/admin/departments/class_countryGeneric.inc b/gosa-core/plugins/admin/departments/class_countryGeneric.inc index d44f72e68..0e29a7ad5 100644 --- a/gosa-core/plugins/admin/departments/class_countryGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_countryGeneric.inc @@ -37,6 +37,28 @@ class country extends department return($message); } + + /* Return plugin informations for acl handling */ + static function plInfo() + { + return (array("plShortName" => _("Country"), + "plDescription" => _("Country"), + "plSelfModify" => FALSE, + "plPriority" => 2, + "plDepends" => array(), + "plSection" => array("admin"), + "plCategory" => array("department"), + + "plProvidedAcls" => array( +# "searchGuide" => _("Search guide"), +# "seeAlso" => _("See also"), + "street" => _("Street"), + "base" => _("Base"), + "gosaUnitTag" => _("Administrative settings"), + "description" => _("Description"), + "c" => _("Country name")), + )); + } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/gosa-core/plugins/admin/departments/class_localityGeneric.inc b/gosa-core/plugins/admin/departments/class_localityGeneric.inc index b0c009018..2944748cf 100644 --- a/gosa-core/plugins/admin/departments/class_localityGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_localityGeneric.inc @@ -23,12 +23,13 @@ class locality extends department { /* attribute list for save action */ - var $attributes = array( "l", "description"); + var $attributes = array("l", "description"); var $objectclasses = array("top", "locality"); - var $type ="l"; - var $l =""; - var $orgi_l =""; + var $description= ""; + var $type = "l"; + var $l = ""; + var $orig_l = ""; var $namingAttr = "l"; function check() @@ -37,6 +38,30 @@ class locality extends department return($message); } + + /* Return plugin informations for acl handling */ + static function plInfo() + { + return (array("plShortName" => _("Locality"), + "plDescription" => _("Locality"), + "plSelfModify" => FALSE, + "plPriority" => 3, + "plDepends" => array(), + "plSection" => array("admin"), + "plCategory" => array("department"), + + "plProvidedAcls" => array( + + + + "description" => _("Description"), + "l" => _("Location"), + "st" => _("State"), + + "base" => _("Base"), + "gosaUnitTag" => _("Administrative settings")), + )); + } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/gosa-core/plugins/admin/departments/class_organizationGeneric.inc b/gosa-core/plugins/admin/departments/class_organizationGeneric.inc index 5a1219c2a..f6f4c9097 100644 --- a/gosa-core/plugins/admin/departments/class_organizationGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_organizationGeneric.inc @@ -76,7 +76,7 @@ class organization extends department return (array("plShortName" => _("Organization"), "plDescription" => _("Organization"), "plSelfModify" => FALSE, - "plPriority" => 0, + "plPriority" => 1, "plDepends" => array(), "plSection" => array("admin"), "plCategory" => array("department"), diff --git a/gosa-core/plugins/admin/departments/country.tpl b/gosa-core/plugins/admin/departments/country.tpl index 437a1c2a6..c2ad34b2d 100644 --- a/gosa-core/plugins/admin/departments/country.tpl +++ b/gosa-core/plugins/admin/departments/country.tpl @@ -10,7 +10,7 @@ {$must} -{render acl=$ouACL} +{render acl=$cACL} {/render} @@ -52,3 +52,4 @@ + diff --git a/gosa-core/plugins/admin/departments/locality.tpl b/gosa-core/plugins/admin/departments/locality.tpl index 10c929013..8a1f46e3f 100644 --- a/gosa-core/plugins/admin/departments/locality.tpl +++ b/gosa-core/plugins/admin/departments/locality.tpl @@ -10,7 +10,7 @@ {$must} -{render acl=$ouACL} +{render acl=$lACL} {/render} @@ -52,3 +52,4 @@ + diff --git a/gosa-core/plugins/admin/departments/organization.tpl b/gosa-core/plugins/admin/departments/organization.tpl index 26ddc581c..69fb3c1e5 100644 --- a/gosa-core/plugins/admin/departments/organization.tpl +++ b/gosa-core/plugins/admin/departments/organization.tpl @@ -124,3 +124,4 @@ focus_field('o'); --> + -- 2.30.2