From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 14 May 2010 09:58:15 +0000 (+0000)
Subject: Updated migration process
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7cdfe86c50d0a25ffd0027dc4d26ee35ff422d34;p=gosa.git

Updated migration process


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

diff --git a/gosa-core/include/class_configRegistry.inc b/gosa-core/include/class_configRegistry.inc
index 9936b023f..d2c71a594 100644
--- a/gosa-core/include/class_configRegistry.inc
+++ b/gosa-core/include/class_configRegistry.inc
@@ -251,8 +251,12 @@ class gosaProperty
         // Initialize with the current value
         $this->_restoreCurrentValue(); 
 
+    }
+
+    function migrationRequired()
+    {
         // Instantiate migration class 
-        if(!empty($this->migrate)){
+        if(!empty($this->migrate) && $this->migrationClass == NULL){
             if(!class_available($this->migrate)){
                 trigger_error("Cannot start migration for gosaProperty::'{$this->getName()}' class not found ({$this->migrate})!");
             }else{
@@ -260,14 +264,11 @@ class gosaProperty
                 $tmp = new $class($this->parent->config,$this);
                 if(! $tmp instanceof propertyMigration){ 
                     trigger_error("Cannot start migration for gosaProperty::'{$this->getName()}' doesn't implement propertyMigration!");
+                }else{
+                    $this->migrationClass = $tmp;
                 }
-                $this->migrationClass = $tmp;
             }
         }
-    }
-
-    function migrationRequired()
-    {
         if(empty($this->migrate) || $this->migrationClass == NULL){
             return(FALSE);
         }
diff --git a/gosa-core/plugins/addons/configViewer/migration/class_migrateRDN.inc b/gosa-core/plugins/addons/configViewer/migration/class_migrateRDN.inc
index 046b3ef59..deefb0be5 100644
--- a/gosa-core/plugins/addons/configViewer/migration/class_migrateRDN.inc
+++ b/gosa-core/plugins/addons/configViewer/migration/class_migrateRDN.inc
@@ -23,6 +23,11 @@ class migrateRDN implements propertyMigration
         $this->config = &$config;
     }   
 
+    function getChanges()
+    {
+        return($this->found);
+    }
+
     function checkForIssues()
     {
         $this->found = array();