Added spacing below list

[gosa.git] / gosa-core / setup / class_setupStep_Migrate.inc

diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc
index 832064e344c6e5636734d7ae6d2e140bca46e3ec..2b7630a11bd96b23f61edc70f8060ebccb5e28c3 100644 (file)
--- a/gosa-core/setup/class_setupStep_Migrate.inc
+++ b/gosa-core/setup/class_setupStep_Migrate.inc
@@ -1051,6 +1051,9 @@ class Step_Migrate extends setup_step
         $this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='create_acls' value='"._("Create")."'>";
       }
     }
+
+    // Reload base OC
+    $this->checkBaseOC();
     return($GOsa_26_found);
   }
 
@@ -1593,6 +1596,8 @@ class Step_Migrate extends setup_step
       /* Update ldap and reload check infos 
        */
       $this->migrate_selected_admin_users();
+      $this->dialog = FALSE;
+      $this->acl_migrate_dialog = FALSE;
 
     }elseif($this->acl_migrate_dialog){
 
@@ -2134,8 +2139,10 @@ class Step_Migrate extends setup_step
         if(isset($this->rootOC_details['mods'])){
           $res  = $ldap->modify($this->rootOC_details['mods']);        
           if(!$res){
-            msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $source, LDAP_MOD, get_class()));
+            msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $cv['base'], LDAP_MOD, get_class()));
           }
+          $this->checkBaseOC();
+          $this->check_administrativeAccount();
           return($res);
         }else{
           trigger_error("No modifications to make... ");