From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 14 Dec 2006 11:28:41 +0000 (+0000)
Subject: Fixed move + rename for deparments
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=03a00c7b2ee94768375c43e5e0091e87c65b2294;p=gosa.git

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 7c06af858..54133fdfc 100644
--- 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 b62679e13..2891377dd 100644
--- 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 285b93a79..c78b2344a 100644
--- 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));
   }