- fix a bug on inheritance

Author: ecarriou

src/metamodel.js

@@ -183,6 +183,18 @@ function generateModels() {
         store.generatedModels[model._name] = model;
     }
 
+    // models to override
+    for (modelName in store.generatedModels) {
+        model = store.generatedModels[modelName];
+        name = model[NAME];
+        modelExt = store.models[name];
+        if (modelExt) {
+            mergedModel = merge(modelExt, model);
+            delete mergedModel._id;
+            store.generatedModels[name] = mergedModel;
+        }
+    }
+
     // parents
     for (modelName in store.generatedModels) {
         model = store.generatedModels[modelName];
@@ -195,7 +207,7 @@ function generateModels() {
         }
         for (i = 0; i < length; i++) {
             name = parents[i];
-            modelParent = store.models[name];
+            modelParent = store.generatedModels[name];
             if (modelParent) {
                 mergedModel = merge(modelParent, model);
                 delete mergedModel._id;
@@ -204,18 +216,6 @@ function generateModels() {
         }
     }
 
-    // models to override
-    for (modelName in store.generatedModels) {
-        model = store.generatedModels[modelName];
-        name = model[NAME];
-        modelExt = store.models[name];
-        if (modelExt) {
-            mergedModel = merge(modelExt, model);
-            delete mergedModel._id;
-            store.generatedModels[name] = mergedModel;
-        }
-    }
-
     // save 
     for (modelName in store.generatedModels) {
         modelDef = store.generatedModels[modelName];