From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 30 Oct 2009 15:32:38 +0000 (+0000)
Subject: Updated department Management
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f17e15e52de37e71708aa5d5eb63d57408dbd8fe;p=gosa.git

Updated department Management
-Removed unused move code.


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

diff --git a/gosa-core/plugins/admin/departments/class_departmentManagement.inc b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
index 24dbdca97..5397a3620 100644
--- a/gosa-core/plugins/admin/departments/class_departmentManagement.inc
+++ b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
@@ -117,7 +117,17 @@ class departmentManagement extends management
     return(management::editEntry($action,$target,$all,$this->tabClass,$types[$type]['TAB'],$this->aclCategory));
   }
 
+  protected function saveChanges()
+  {
+    management::saveChanges();
+    
+    if($this->last_tabObject->am_i_moved()){
+      return($smarty->fetch(get_template_path("dep_move_confirm.tpl",TRUE)));
+    }
+  }
   
+ 
+ 
   function openEntry($action,$entry)
   {
     $this->headpage->setBase(array_pop($entry));
diff --git a/gosa-core/plugins/admin/departments/tabs_department.inc b/gosa-core/plugins/admin/departments/tabs_department.inc
index dcb1fef10..c3d23e567 100644
--- a/gosa-core/plugins/admin/departments/tabs_department.inc
+++ b/gosa-core/plugins/admin/departments/tabs_department.inc
@@ -50,64 +50,10 @@ class deptabs extends tabs
     return (tabs::check(TRUE));
   }
 
-
-  /*! \brief Check if the department must must be moved 
-      return Boolean TRUE if we have to move the dep, else FALSE
-   */
-  function am_i_moved()
-  {
-    return(FALSE);
-    if($this->moved) return(FALSE);
-    $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); 
-    }
-    return(FALSE);
-  }
-
- 
-  /*! \brief  Checks if the department was moved successfully 
-      @return Boolean TRUE if the dep was already moved.
-   */ 
-  function move_done()
-  {
-    return($this->moved);
-  }
-
-  
-  /*! \brief  Initiate recursive move 
-   */
-  function move_me()
-  {
-    if(!$this->am_i_moved()) return;
-    $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);
-    $old_dn   = @LDAP::convert('ou='.$ou.','.$baseobject->orig_base);
-    if ($this->dn != $new_dn && $this->dn != "new"){
-      $baseobject->recursive_move($this->dn, $new_dn);
-      $this->moved= TRUE;
-    }
-  }
-
-
   function save($ignore_account= FALSE)
   {
     $baseobject= &$this->by_object[$this->base_name];
-
     $namingAttr       = $baseobject->namingAttr;
-
     $nAV      = preg_replace('/,/', '\,', $baseobject->$namingAttr); 
     $new_dn   = @LDAP::convert($namingAttr.'='.$nAV.','.$baseobject->base);
 
@@ -123,15 +69,12 @@ class deptabs extends tabs
       $config->get_departments();
     }
 
-
     $this->dn= $new_dn;
     $baseobject->dn= $this->dn;
     if (!$ignore_account){
       tabs::save(TRUE);
     }
   }
-
-
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>