From d9a99d65c0a2747863478c63ad60fa9d9fd075b0 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 16 Jul 2008 12:27:43 +0000 Subject: [PATCH] Fixed Problem with unitTag Acls. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11683 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../departments/class_departmentGeneric.inc | 23 ++++++++++--------- .../plugins/admin/departments/country.tpl | 2 +- .../plugins/admin/departments/dcObject.tpl | 2 +- .../plugins/admin/departments/generic.tpl | 2 +- .../plugins/admin/departments/locality.tpl | 2 +- .../admin/departments/organization.tpl | 2 +- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc index d6cd8e31d..e85198432 100644 --- a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc @@ -175,9 +175,9 @@ class department extends plugin /* Set admin unit flag */ if ($this->is_administrational_unit) { - $smarty->assign("unitTag", "checked"); + $smarty->assign("gosaUnitTag", "checked"); } else { - $smarty->assign("unitTag", ""); + $smarty->assign("gosaUnitTag", ""); } $smarty->assign("dep_type",$this->type); @@ -253,8 +253,8 @@ class department extends plugin } /* Save tagging flag */ - if ($this->acl_is_writeable("unitTag")){ - if (isset($_POST['unitTag'])){ + if ($this->acl_is_writeable("gosaUnitTag")){ + if (isset($_POST['gosaUnitTag'])){ $this->is_administrational_unit= true; } else { $this->is_administrational_unit= false; @@ -590,17 +590,18 @@ class department extends plugin "plCategory" => array("department" => array("objectClass" => "gosaDepartment", "description" => _("Departments"))), "plProvidedAcls" => array( - "description" => _("Description"), - "c" => _("Country"), - "base" => _("Base"), - "l" => _("Location"), - "telephoneNumber" => _("Telephone"), "ou" => _("Department name"), + "description" => _("Description"), "businessCategory" => _("Category"), + "base" => _("Base"), + "st" => _("State"), + "l" => _("Location"), "postalAddress" => _("Address"), - "gosaUnitTag" => _("Administrative settings"), - "facsimileTelephoneNumber" => _("Fax")) + "telephoneNumber" => _("Telephone"), + "facsimileTelephoneNumber" => _("Fax"), + + "gosaUnitTag" => _("Administrative settings")) )); } diff --git a/gosa-core/plugins/admin/departments/country.tpl b/gosa-core/plugins/admin/departments/country.tpl index ca2d49926..7974f812d 100644 --- a/gosa-core/plugins/admin/departments/country.tpl +++ b/gosa-core/plugins/admin/departments/country.tpl @@ -49,7 +49,7 @@

{t}Administrative settings{/t}

{render acl=$gosaUnitTagACL} - + {/render} diff --git a/gosa-core/plugins/admin/departments/dcObject.tpl b/gosa-core/plugins/admin/departments/dcObject.tpl index 70b9a1d90..3994fbeb7 100644 --- a/gosa-core/plugins/admin/departments/dcObject.tpl +++ b/gosa-core/plugins/admin/departments/dcObject.tpl @@ -49,7 +49,7 @@

{t}Administrative settings{/t}

{render acl=$gosaUnitTagACL} - + {/render} diff --git a/gosa-core/plugins/admin/departments/generic.tpl b/gosa-core/plugins/admin/departments/generic.tpl index 5a90e01f2..f99312fa1 100644 --- a/gosa-core/plugins/admin/departments/generic.tpl +++ b/gosa-core/plugins/admin/departments/generic.tpl @@ -113,7 +113,7 @@

{t}Administrative settings{/t}

{render acl=$gosaUnitTagACL} - + {/render} diff --git a/gosa-core/plugins/admin/departments/locality.tpl b/gosa-core/plugins/admin/departments/locality.tpl index 62a3816e5..eb330eacc 100644 --- a/gosa-core/plugins/admin/departments/locality.tpl +++ b/gosa-core/plugins/admin/departments/locality.tpl @@ -49,7 +49,7 @@

{t}Administrative settings{/t}

{render acl=$gosaUnitTagACL} - + {/render} diff --git a/gosa-core/plugins/admin/departments/organization.tpl b/gosa-core/plugins/admin/departments/organization.tpl index 88a761214..028d1d22d 100644 --- a/gosa-core/plugins/admin/departments/organization.tpl +++ b/gosa-core/plugins/admin/departments/organization.tpl @@ -113,7 +113,7 @@

{t}Administrative settings{/t}

{render acl=$gosaUnitTagACL} - + {/render} -- 2.30.2