From ad1c8825b6b8366697f3870e9794ce5671d2add5 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 2 Jul 2008 05:46:13 +0000 Subject: [PATCH] Updated departments. -Hide the base selector, if the currently edited department is the base object. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11502 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../plugins/admin/departments/class_departmentGeneric.inc | 7 +++++++ gosa-core/plugins/admin/departments/country.tpl | 2 ++ gosa-core/plugins/admin/departments/dcObject.tpl | 2 ++ gosa-core/plugins/admin/departments/generic.tpl | 2 ++ gosa-core/plugins/admin/departments/locality.tpl | 2 ++ gosa-core/plugins/admin/departments/organization.tpl | 2 ++ 6 files changed, 17 insertions(+) diff --git a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc index 8b04650e2..eec9adf02 100644 --- a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc @@ -107,6 +107,13 @@ class department extends plugin $this->config->make_idepartments(); $smarty= get_smarty(); + /* Hide base selector, if this object represents the base itself + */ + $smarty->assign("hide_base", FALSE); + if($this->dn == $this->config->current['BASE']){ + $smarty->assign("hide_base", TRUE); + } + $tmp = $this->plInfo(); foreach($tmp['plProvidedAcls'] as $name => $translation){ $smarty->assign($name."ACL",$this->getacl($name)); diff --git a/gosa-core/plugins/admin/departments/country.tpl b/gosa-core/plugins/admin/departments/country.tpl index c2ad34b2d..be7717f24 100644 --- a/gosa-core/plugins/admin/departments/country.tpl +++ b/gosa-core/plugins/admin/departments/country.tpl @@ -23,6 +23,7 @@ {/render} + {if !$hide_base} {$must} @@ -37,6 +38,7 @@ {/render} + {/if} diff --git a/gosa-core/plugins/admin/departments/dcObject.tpl b/gosa-core/plugins/admin/departments/dcObject.tpl index 29ecf5c80..92465f0d9 100644 --- a/gosa-core/plugins/admin/departments/dcObject.tpl +++ b/gosa-core/plugins/admin/departments/dcObject.tpl @@ -23,6 +23,7 @@ {/render} + {if !$hide_base} {$must} @@ -37,6 +38,7 @@ {/render} + {/if} diff --git a/gosa-core/plugins/admin/departments/generic.tpl b/gosa-core/plugins/admin/departments/generic.tpl index 3b44f6f1e..bfc135ed7 100644 --- a/gosa-core/plugins/admin/departments/generic.tpl +++ b/gosa-core/plugins/admin/departments/generic.tpl @@ -34,6 +34,7 @@
+ {if !$hide_base} {$must} @@ -49,6 +50,7 @@ {/render} + {/if} diff --git a/gosa-core/plugins/admin/departments/locality.tpl b/gosa-core/plugins/admin/departments/locality.tpl index 8a1f46e3f..d3715757d 100644 --- a/gosa-core/plugins/admin/departments/locality.tpl +++ b/gosa-core/plugins/admin/departments/locality.tpl @@ -23,6 +23,7 @@ {/render} + {if !$hide_base} {$must} @@ -37,6 +38,7 @@ {/render} + {/if} diff --git a/gosa-core/plugins/admin/departments/organization.tpl b/gosa-core/plugins/admin/departments/organization.tpl index 69fb3c1e5..2b2563be3 100644 --- a/gosa-core/plugins/admin/departments/organization.tpl +++ b/gosa-core/plugins/admin/departments/organization.tpl @@ -34,6 +34,7 @@
+ {if !$hide_base} {$must} @@ -49,6 +50,7 @@ {/render} + {/if} -- 2.30.2