From: hickert Date: Wed, 25 Jun 2008 06:47:25 +0000 (+0000) Subject: Updated deparment saving X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=680135992da4063e04476aaff73c7a94df3fc0b0;p=gosa.git Updated deparment saving -Add 'ou' and objectClass 'gosaDepartment' to each container obejct. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11429 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/plugins/admin/departments/class_countryGeneric.inc b/gosa-core/plugins/admin/departments/class_countryGeneric.inc index 0e29a7ad5..b38fa2871 100644 --- a/gosa-core/plugins/admin/departments/class_countryGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_countryGeneric.inc @@ -23,8 +23,8 @@ class country extends department { /* attribute list for save action */ - var $attributes = array( "c", "description"); - var $objectclasses = array("top", "country"); + var $attributes = array( "c", "ou", "description"); + var $objectclasses = array("top", "country", "gosaDepartment"); var $type ="c"; var $c =""; var $orgi_c =""; diff --git a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc index c8da2b281..5026fd9ab 100644 --- a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc @@ -301,6 +301,11 @@ class department extends plugin { $ldap= $this->config->get_ldap_link(); + /* Ensure that ou is saved too, it is required by objectClass gosaDepartment + */ + $nA = $this->namingAttr; + $this->ou = $this->$nA; + /* Add tag objects if needed */ if ($this->is_administrational_unit){ diff --git a/gosa-core/plugins/admin/departments/class_divListDepartment.inc b/gosa-core/plugins/admin/departments/class_divListDepartment.inc index cc3835dec..87011c322 100644 --- a/gosa-core/plugins/admin/departments/class_divListDepartment.inc +++ b/gosa-core/plugins/admin/departments/class_divListDepartment.inc @@ -172,15 +172,21 @@ class divListDepartment extends MultiSelectWindow " "._("Locality")." (l)|dep_new_l|\n"; } - if(preg_match("/c/",$ui->get_permissions("ou=dummy,".$this->selectedBase ,"department/alias"))) { - $s.= "...|". - " "._("Alias")."|dep_new_alias|\n"; + if(preg_match("/c/",$ui->get_permissions("ou=dummy,".$this->selectedBase ,"department/dcObject"))) { + $s.= "...|". + " "._("Domain component")." (l)|dep_new_dc|\n"; } - if(preg_match("/c/",$ui->get_permissions("ou=dummy,".$this->selectedBase ,"department/referal"))) { - $s.= "...|". - " "._("Referal")."|dep_new_referal|\n"; - } + +# if(preg_match("/c/",$ui->get_permissions("ou=dummy,".$this->selectedBase ,"department/alias"))) { +# $s.= "...|". +# " "._("Alias")."|dep_new_alias|\n"; +# } +# +# if(preg_match("/c/",$ui->get_permissions("ou=dummy,".$this->selectedBase ,"department/referal"))) { +# $s.= "...|". +# " "._("Referal")."|dep_new_referal|\n"; +# } $s.= "..|---|\n"; $s.= "..|". diff --git a/gosa-core/plugins/admin/departments/class_localityGeneric.inc b/gosa-core/plugins/admin/departments/class_localityGeneric.inc index 2944748cf..0f563976e 100644 --- a/gosa-core/plugins/admin/departments/class_localityGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_localityGeneric.inc @@ -23,8 +23,8 @@ class locality extends department { /* attribute list for save action */ - var $attributes = array("l", "description"); - var $objectclasses = array("top", "locality"); + var $attributes = array("l", "description", "ou"); + var $objectclasses = array("top", "locality", "gosaDepartment"); var $description= ""; var $type = "l"; diff --git a/gosa-core/plugins/admin/departments/class_organizationGeneric.inc b/gosa-core/plugins/admin/departments/class_organizationGeneric.inc index f6f4c9097..507b2a113 100644 --- a/gosa-core/plugins/admin/departments/class_organizationGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_organizationGeneric.inc @@ -23,14 +23,14 @@ class organization extends department { /* attribute list for save action */ - var $attributes = array( "o", "description","userPassword","searchGuide", + var $attributes = array( "o", "ou", "description","userPassword","searchGuide", "seeAlso","businessCategory","x121Address","registeredAddress", "destinationIndicator","preferredDeliveryMethod","telexNumber", "telephoneNumber","internationaliSDNNumber","facsimileTelephoneNumber","street", "postOfficeBox","postalCode", "postalAddress","physicalDeliveryOfficeName", "st","l","teletexTerminalIdentifier"); - var $objectclasses = array("top", "organization"); + var $objectclasses = array("top", "organization", "gosaDepartment"); /* Attributes */