diff --git a/gosa-core/plugins/admin/departments/tabs_department.inc b/gosa-core/plugins/admin/departments/tabs_department.inc
index 7e9b45c3ac4d7ea87643c2959358fcae868b0aa8..dcb1fef10b1c98730c351b5c5cd4f4481841df55 100644 (file)
{
var $base= "";
var $moved = FALSE;
{
var $base= "";
var $moved = FALSE;
+ var $base_name = "department";
- function deptabs($config, $data, $dn,$category)
+ function deptabs($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
{
{
- tabs::tabs($config, $data, $dn,$category);
- $this->base= $this->by_object['department']->base;
+ tabs::tabs($config, $data, $dn,$category,$hide_refs, $hide_acls);
+
+ /* Detect the base class (The classs which extends from department)
+ */
+ foreach($this->by_object as $name => $object){
+ if($object instanceOf department){
+ $this->base_name = get_class($object);
+ break;
+ }
+ }
+
/* Add references/acls/snapshots */
$this->addSpecialTabs();
/* Add references/acls/snapshots */
$this->addSpecialTabs();
{
return(FALSE);
if($this->moved) return(FALSE);
{
return(FALSE);
if($this->moved) return(FALSE);
- $baseobject= &$this->by_object['department'];
- $ou = preg_replace('/,/', '\,', $baseobject->ou);
- $new_dn = @LDAP::convert('ou='.$ou.','.$baseobject->base);
- $old_ou = preg_replace('/,/', '\,', $baseobject->orig_ou);
- $old_dn = @LDAP::convert('ou='.$ou.','.$baseobject->orig_base);
+ $baseobject= &$this->by_object[$this->base_name];
+
+ $namingAttr = $baseobject->namingAttr;
+ $orig_namingAttr = $baseobject->orig_namingAttr;
+
+ $value = preg_replace('/,/', '\,', $baseobject->$namingAttr);
+ $orig_value = preg_replace('/,/', '\,', $baseobject->$orig_namingAttr);
+
+ $new_dn = @LDAP::convert($namingAttr.'='.$value.','.$baseobject->base);
+ $old_dn = @LDAP::convert($namingAttr.'='.$orig_value.','.$baseobject->orig_base);
+
if ($this->dn != $new_dn && $this->dn != "new"){
return(TRUE);
}
if ($this->dn != $new_dn && $this->dn != "new"){
return(TRUE);
}
function move_me()
{
if(!$this->am_i_moved()) return;
function move_me()
{
if(!$this->am_i_moved()) return;
- $baseobject= &$this->by_object['department'];
+ $baseobject= &$this->by_object[$this->base_name];
$ou = preg_replace('/,/', '\,', $baseobject->ou);
$new_dn = @LDAP::convert('ou='.$ou.','.$baseobject->base);
$old_ou = preg_replace('/,/', '\,', $baseobject->orig_ou);
$ou = preg_replace('/,/', '\,', $baseobject->ou);
$new_dn = @LDAP::convert('ou='.$ou.','.$baseobject->base);
$old_ou = preg_replace('/,/', '\,', $baseobject->orig_ou);
function save($ignore_account= FALSE)
{
function save($ignore_account= FALSE)
{
- $baseobject= &$this->by_object['department'];
- $ou = preg_replace('/,/', '\,', $baseobject->ou);
- $new_dn = @LDAP::convert('ou='.$ou.','.$baseobject->base);
+ $baseobject= &$this->by_object[$this->base_name];
+
+ $namingAttr = $baseobject->namingAttr;
+
+ $nAV = preg_replace('/,/', '\,', $baseobject->$namingAttr);
+ $new_dn = @LDAP::convert($namingAttr.'='.$nAV.','.$baseobject->base);
/* Move group? */
if ($this->dn != $new_dn && $this->dn != "new"){
/* Move group? */
if ($this->dn != $new_dn && $this->dn != "new"){
- $baseobject->move($this->dn,$new_dn);
+ $baseobject->move($this->dn,$new_dn);
}
}
+ /* Update department cache.
+ */
+ if($this->dn != $new_dn){
+ global $config;
+ $config->get_departments();
+ }
+
+
$this->dn= $new_dn;
$baseobject->dn= $this->dn;
if (!$ignore_account){
$this->dn= $new_dn;
$baseobject->dn= $this->dn;
if (!$ignore_account){