Do last field import after hook imports

nerds-and-company · Dec 14, 2018 · edf5443 · edf5443
1 parent 0860ddb
commit edf5443
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 3.8.12 ###
+- Do last fields import after hook imports
+
 ### 3.8.11 ###
 - Fixed registerSchematicSources hook
 

diff --git a/src/Services/Schematic.php b/src/Services/Schematic.php
@@ -189,11 +189,6 @@ private function importDataModel(Data $model, $force, $dataTypes = 'all')
             $userImportResult = Craft::app()->schematic_users->import($users, true);
         }
 
-        if (in_array('fields', $dataTypes)) {
-            $fields = $model->getAttribute('fields');
-            $fieldImportResultFinal = Craft::app()->schematic_fields->import($fields, $force);
-        }
-
         if (in_array('elementIndexSettings', $dataTypes)) {
             // Element index settings are supported from Craft 2.5
             if (version_compare(CRAFT_VERSION, '2.5', '>=')) {
@@ -227,6 +222,11 @@ private function importDataModel(Data $model, $force, $dataTypes = 'all')
         $services = Craft::app()->plugins->call('registerMigrationService');
         $this->doImport($result, $model->pluginData, $services, $force);
 
+        if (in_array('fields', $dataTypes)) {
+            $fields = $model->getAttribute('fields');
+            $fieldImportResultFinal = Craft::app()->schematic_fields->import($fields, $force);
+        }
+
         return $result;
     }