From 6f56e91198857bfb73ecfcfe1442f406db20d18b Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 24 Feb 2010 10:29:13 +0000 Subject: [PATCH] Added manager attribute handling to the differnt kind of departments git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15686 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../departments/class_countryGeneric.inc | 7 +++++- .../admin/departments/class_dcObject.inc | 7 +++++- .../admin/departments/class_domain.inc | 7 +++++- .../departments/class_localityGeneric.inc | 7 +++++- .../departments/class_organizationGeneric.inc | 8 ++++++- .../plugins/admin/departments/country.tpl | 23 +++++++++++++++++++ .../plugins/admin/departments/dcObject.tpl | 23 +++++++++++++++++++ .../plugins/admin/departments/domain.tpl | 23 +++++++++++++++++++ .../plugins/admin/departments/locality.tpl | 23 +++++++++++++++++++ .../admin/departments/organization.tpl | 23 +++++++++++++++++++ 10 files changed, 146 insertions(+), 5 deletions(-) diff --git a/gosa-core/plugins/admin/departments/class_countryGeneric.inc b/gosa-core/plugins/admin/departments/class_countryGeneric.inc index da87b9150..f69343431 100644 --- a/gosa-core/plugins/admin/departments/class_countryGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_countryGeneric.inc @@ -23,7 +23,7 @@ class country extends department { /* attribute list for save action */ - var $attributes = array( "c", "ou", "description","gosaUnitTag"); + var $attributes = array( "c", "ou", "description","gosaUnitTag", "manager"); var $objectclasses = array("top", "gosaDepartment"); var $structuralOC = array("country"); var $type ="country"; @@ -31,6 +31,10 @@ class country extends department var $orgi_c =""; var $namingAttr = "c"; + var $manager_enabled = FALSE; + var $manager_name =""; + var $manager =""; + function check() { @@ -86,6 +90,7 @@ class country extends department "plProvidedAcls" => array( "c" => _("Country name"), "description" => _("Description"), + "manager" => _("Manager"), "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 246e6539d..c4423d7fa 100644 --- a/gosa-core/plugins/admin/departments/class_dcObject.inc +++ b/gosa-core/plugins/admin/departments/class_dcObject.inc @@ -23,7 +23,7 @@ class dcObject extends department { /* attribute list for save action */ - var $attributes = array( "dc", "ou", "description","gosaUnitTag"); + var $attributes = array( "dc", "ou", "description","gosaUnitTag", "manager"); var $objectclasses = array("top", "dcObject", "gosaDepartment"); var $structuralOC = array("locality"); var $type = "dcObject"; @@ -31,6 +31,10 @@ class dcObject extends department var $orgi_dc = ""; var $namingAttr = "dc"; + var $manager_enabled = FALSE; + var $manager_name =""; + var $manager =""; + function check() { @@ -85,6 +89,7 @@ class dcObject extends department "plProvidedAcls" => array( "dc" => _("Name"), "description" => _("Description"), + "manager" => _("Manager"), "base" => _("Base"), "gosaUnitTag" => _("Administrative settings")) )); diff --git a/gosa-core/plugins/admin/departments/class_domain.inc b/gosa-core/plugins/admin/departments/class_domain.inc index 1e37d2b7b..560503a7d 100644 --- a/gosa-core/plugins/admin/departments/class_domain.inc +++ b/gosa-core/plugins/admin/departments/class_domain.inc @@ -23,7 +23,7 @@ class domain extends department { /* attribute list for save action */ - var $attributes = array( "dc", "ou", "description","gosaUnitTag"); + var $attributes = array( "dc", "ou", "description","gosaUnitTag", "manager"); var $objectclasses = array("top", "domain", "gosaDepartment"); var $structuralOC = array("domain"); var $type = "domain"; @@ -31,6 +31,10 @@ class domain extends department var $orgi_dc = ""; var $namingAttr = "dc"; + var $manager_enabled = FALSE; + var $manager_name =""; + var $manager =""; + function check() { @@ -86,6 +90,7 @@ class domain extends department "dc" => _("Name"), "description" => _("Description"), "base" => _("Base"), + "manager" => _("Manager"), "gosaUnitTag" => _("Administrative settings")) )); } diff --git a/gosa-core/plugins/admin/departments/class_localityGeneric.inc b/gosa-core/plugins/admin/departments/class_localityGeneric.inc index 5394bcbd8..9c435ee41 100644 --- a/gosa-core/plugins/admin/departments/class_localityGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_localityGeneric.inc @@ -23,7 +23,7 @@ class locality extends department { /* attribute list for save action */ - var $attributes = array("l", "description", "ou", "gosaUnitTag"); + var $attributes = array("l", "description", "ou", "gosaUnitTag", "manager"); var $objectclasses = array("top", "gosaDepartment"); var $structuralOC = array("locality"); @@ -33,6 +33,10 @@ class locality extends department var $orig_l = ""; var $namingAttr = "l"; + var $manager_enabled = FALSE; + var $manager_name =""; + var $manager =""; + function check() { $message = plugin::check(); @@ -86,6 +90,7 @@ class locality extends department "plProvidedAcls" => array( "l" => _("Location"), "description" => _("Description"), + "manager" => _("Manager"), "base" => _("Base"), "gosaUnitTag" => _("Administrative settings")) )); diff --git a/gosa-core/plugins/admin/departments/class_organizationGeneric.inc b/gosa-core/plugins/admin/departments/class_organizationGeneric.inc index ead3c230f..7f55361f9 100644 --- a/gosa-core/plugins/admin/departments/class_organizationGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_organizationGeneric.inc @@ -24,7 +24,7 @@ class organization extends department { /* attribute list for save action */ var $attributes = array( "o", "ou", "description","userPassword","searchGuide", - "seeAlso","businessCategory","x121Address","registeredAddress", + "seeAlso","businessCategory","x121Address","registeredAddress","manager", "destinationIndicator","preferredDeliveryMethod","telexNumber", "telephoneNumber","internationaliSDNNumber","facsimileTelephoneNumber","street", "postOfficeBox","postalCode", "postalAddress","physicalDeliveryOfficeName", @@ -64,6 +64,10 @@ class organization extends department var $orgi_o = ""; var $namingAttr = "o"; + var $manager_enabled = FALSE; + var $manager_name =""; + var $manager =""; + function check() { $message = plugin::check(); @@ -120,6 +124,8 @@ class organization extends department "businessCategory" => _("Category"), "base" => _("Base"), + "manager" => _("Manager"), + "st" => _("State"), "l" => _("Location"), "postalAddress" => _("Postal address"), diff --git a/gosa-core/plugins/admin/departments/country.tpl b/gosa-core/plugins/admin/departments/country.tpl index eff9c73a1..d3da83a1a 100644 --- a/gosa-core/plugins/admin/departments/country.tpl +++ b/gosa-core/plugins/admin/departments/country.tpl @@ -33,6 +33,29 @@ {/if} + + {if $manager_enabled} + + + +{render acl=$managerACL} + +{/render} +{render acl=$managerACL} + +{/render} + {if $manager!=""} +{render acl=$managerACL} + +{/render} +{render acl=$managerACL} + +{/render} + {/if} + + + {/if} diff --git a/gosa-core/plugins/admin/departments/dcObject.tpl b/gosa-core/plugins/admin/departments/dcObject.tpl index 51a6ec459..23c7aa466 100644 --- a/gosa-core/plugins/admin/departments/dcObject.tpl +++ b/gosa-core/plugins/admin/departments/dcObject.tpl @@ -33,6 +33,29 @@ {/if} + + {if $manager_enabled} + + + +{render acl=$managerACL} + +{/render} +{render acl=$managerACL} + +{/render} + {if $manager!=""} +{render acl=$managerACL} + +{/render} +{render acl=$managerACL} + +{/render} + {/if} + + + {/if} diff --git a/gosa-core/plugins/admin/departments/domain.tpl b/gosa-core/plugins/admin/departments/domain.tpl index c30170e6a..a686ed9cf 100644 --- a/gosa-core/plugins/admin/departments/domain.tpl +++ b/gosa-core/plugins/admin/departments/domain.tpl @@ -33,6 +33,29 @@ {/if} + + {if $manager_enabled} + + + +{render acl=$managerACL} + +{/render} +{render acl=$managerACL} + +{/render} + {if $manager!=""} +{render acl=$managerACL} + +{/render} +{render acl=$managerACL} + +{/render} + {/if} + + + {/if} diff --git a/gosa-core/plugins/admin/departments/locality.tpl b/gosa-core/plugins/admin/departments/locality.tpl index e009c37f8..d84781458 100644 --- a/gosa-core/plugins/admin/departments/locality.tpl +++ b/gosa-core/plugins/admin/departments/locality.tpl @@ -33,6 +33,29 @@ {/if} + + {if $manager_enabled} + + + +{render acl=$managerACL} + +{/render} +{render acl=$managerACL} + +{/render} + {if $manager!=""} +{render acl=$managerACL} + +{/render} +{render acl=$managerACL} + +{/render} + {/if} + + + {/if} diff --git a/gosa-core/plugins/admin/departments/organization.tpl b/gosa-core/plugins/admin/departments/organization.tpl index e7c825ce4..8ee12f983 100644 --- a/gosa-core/plugins/admin/departments/organization.tpl +++ b/gosa-core/plugins/admin/departments/organization.tpl @@ -45,6 +45,29 @@ {/if} + + {if $manager_enabled} + + + +{render acl=$managerACL} + +{/render} +{render acl=$managerACL} + +{/render} + {if $manager!=""} +{render acl=$managerACL} + +{/render} +{render acl=$managerACL} + +{/render} + {/if} + + + {/if} -- 2.30.2