Fixed move + rename for deparments

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5392 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/departments/class_departmentGeneric.inc b/plugins/admin/departments/class_departmentGeneric.inc
index 7c06af858829a6d2a23112cec3d9ba965bda0f8e..54133fdfc3ff2d215ceefe03c204ee311cd418b6 100644 (file)
--- a/plugins/admin/departments/class_departmentGeneric.inc
+++ b/plugins/admin/departments/class_departmentGeneric.inc
@@ -214,7 +214,6 @@ class department extends plugin
                $message= plugin::check();
 
                /* Permissions for that base? */
-               //      $this->dn= "ou=$this->ou,".$this->base;
                if (chkacl($this->acl, "create") != ""){
                        $message[]= _("You have no permissions to create a department on this 'Base'.");
                }
@@ -497,8 +496,6 @@ class department extends plugin
 
                        /* Copy objects from small to big indent levels by replacing src_dn by dst_dn */
                        foreach ($objects as $object => $len){
-
-
                                $src= str_replace("\\","\\\\",$object);
                                $dst= preg_replace("/".str_replace("\\","\\\\",$src_dn)."$/", "$dst_dn", $object);
                                $dst= str_replace($src_dn,$dst_dn,$object);

diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index b62679e1328e2dcaf80085d4bf400045af6ce586..2891377dd716520bbdf4c9fbb15b8a6f59779509 100644 (file)
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.inc
@@ -194,7 +194,6 @@ class departmentManagement extends plugin
       if (count($message) == 0){
 
         $this->deptabs->save(true);
-        $this->deptabs->by_object['department']->save();     
 
         /* This object must be tagged, so set ObjectTaggingRequested to true */
         if($this->deptabs->by_object['department']->must_be_tagged()){

diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/admin/departments/tabs_department.inc
index 285b93a7940589aeb9cc7a6396727a5680f221e9..c78b2344a9c2854fb51fd9a00f04433a5fb714f9 100644 (file)
--- a/plugins/admin/departments/tabs_department.inc
+++ b/plugins/admin/departments/tabs_department.inc
@@ -37,9 +37,11 @@ class deptabs extends tabs
         }
       }
     }
+
     $this->dn= $new_dn;
     $baseobject->dn= $this->dn;
     $this->by_object['department']= $baseobject;
+
     return(tabs::save(TRUE));
   }