From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 10 Mar 2008 14:37:12 +0000 (+0000)
Subject: Fixed ordering
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0d4e39c9034f92c61360fc2f70391bda8c59a94e;p=gosa.git

Fixed ordering


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

diff --git a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
index 142ebdd5e..cf204b3d9 100644
--- a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
+++ b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
@@ -196,6 +196,7 @@ class department extends plugin
 
 	function must_be_tagged()
 	{
+echo 3;
 		return $this->must_be_tagged;
 	}
 
@@ -449,7 +450,9 @@ class department extends plugin
 
 	    /* Fix entry if needed */
 	    if ($fix){
+echo "1";
 		    if($OnlySetTagFlag){
+echo "2";
 			    $this->must_be_tagged =true;
 			    return;
 		    }
diff --git a/gosa-core/plugins/admin/departments/class_departmentManagement.inc b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
index 1d040e268..ecf1e0989 100644
--- a/gosa-core/plugins/admin/departments/class_departmentManagement.inc
+++ b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
@@ -294,9 +294,9 @@ class departmentManagement extends plugin
 
       /* Save, or display error message? */
       if (count($message) == 0){
+        global $config;
 
         $this->deptabs->save(true);
-        global $config;
         $config->get_departments();
         $config->make_idepartments();
         $this->config = $config;
@@ -401,9 +401,9 @@ class departmentManagement extends plugin
       $display= $this->deptabs->execute();
       if (!$this->deptabs->by_object[$this->deptabs->current]->dialog){
         $display.= "<p style=\"text-align:right\">\n";
-        $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+        $display.= "<input type=submit name=\"edit_finish\" value=\"".msgPool::okButton()."\">\n";
         $display.= "&nbsp;\n";
-        $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+        $display.= "<input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
         $display.= "</p>";
       }
       return ($display);
diff --git a/gosa-core/plugins/admin/departments/tabs_department.inc b/gosa-core/plugins/admin/departments/tabs_department.inc
index ef0360892..235f3212d 100644
--- a/gosa-core/plugins/admin/departments/tabs_department.inc
+++ b/gosa-core/plugins/admin/departments/tabs_department.inc
@@ -42,7 +42,7 @@ class deptabs extends tabs
 
   function save($ignore_account= FALSE)
   {
-    $baseobject= $this->by_object['department'];
+    $baseobject= &$this->by_object['department'];
     $ou= preg_replace('/,/', '\,', $baseobject->ou);
     $new_dn= @LDAP::convert('ou='.$ou.','.$baseobject->base);
     
@@ -56,14 +56,12 @@ class deptabs extends tabs
         }else{
           /* Prepare to be moved */
           $baseobject->recursive_move($this->dn, $new_dn);			
-          $this->by_object['department'] = $baseobject;
           return;
         }
       }
     }
     $this->dn= $new_dn;
     $baseobject->dn= $this->dn;
-    $this->by_object['department']= $baseobject;
     if (!$ignore_account){
       tabs::save(TRUE);
     }