Add common_fields and make the differences between common fields and default fields

EditorialModel/classtypes.py

@@ -1,6 +1,27 @@
 # -*- coding: utf-8 -*-
 
 
+common_fields = {
+    'lodel_id': {
+        'fieldtype': 'pk',
+        'internal': 'object',
+    },
+    'classid': {
+        'fieldtype': 'integer',
+        'internal': 'object',
+    },
+    'typeid': {
+        'fieldtype': 'integer',
+        'internal': 'object',
+    },
+    'string': {
+        'fieldtype': 'char',
+        'max_length': 128,
+        'internal': 'object',
+    },
+}
+
+
 ## EmNature (Class)
 #
 # constant name for the nature of type hierarchy
@@ -53,25 +74,7 @@ class EmClassType(object):
                 'maxchildren': -1
             },
         },
-        'default_fields': {
-            'lodel_id': {
-                'fieldtype': 'pk',
-                'internal': 'object',
-            },
-            'classid': {
-                'fieldtype': 'integer',
-                'internal': 'object',
-            },
-            'typeid': {
-                'fieldtype': 'integer',
-                'internal': 'object',
-            },
-            'string': {
-                'fieldtype': 'char',
-                'max_length': 128,
-                'internal': 'object',
-            },
-        }
+        'default_fields':{}
     }
 
     entry = {
@@ -88,25 +91,7 @@ class EmClassType(object):
                 'maxchildren': -1
             },
         },
-        'default_fields': {
-            'lodel_id': {
-                'fieldtype': 'pk',
-                'internal': 'object',
-            },
-            'classid': {
-                'fieldtype': 'integer',
-                'internal': 'object',
-            },
-            'typeid': {
-                'fieldtype': 'integer',
-                'internal': 'object',
-            },
-            'string': {
-                'fieldtype': 'char',
-                'max_length': 128,
-                'internal': 'object',
-            },
-        }
+        'default_fields': {}
     }
 
     person = {
@@ -119,25 +104,7 @@ class EmClassType(object):
                 'maxchildren': 1
             },
         },
-        'default_fields': {
-            'lodel_id': {
-                'fieldtype': 'pk',
-                'internal': 'object',
-            },
-            'classid': {
-                'fieldtype': 'integer',
-                'internal': 'object',
-            },
-            'typeid': {
-                'fieldtype': 'integer',
-                'internal': 'object',
-            },
-            'string': {
-                'fieldtype': 'char',
-                'max_length': 128,
-                'internal': 'object',
-            },
-        }
+        'default_fields': {}
     }
     
     ## @brief return a classtype from its name

EditorialModel/fields.py

@@ -44,6 +44,9 @@ class EmField(EmComponent):
                 raise ValueError("The internal arguments possible values are : [False, 'object', 'automatic']")
             self.internal = internal.lower()
 
+        if self.internal == 'object' and name not in EditorialModel.classtypes.common_fields.keys():
+            raise ValueError("Only common_fields are allowed to have the argument internal='object'")
+
         self.rel_field_id = rel_field_id
         self.check_type('rel_field_id', (int, type(None)))
         self.icon = icon

EditorialModel/model.py

@@ -216,7 +216,9 @@ class Model(object):
                     break
 
         ctype = EditorialModel.classtypes.EmClassType.get(emclass.classtype)
-        for fname, fdatas in ctype['default_fields'].items():
+        default_fields = ctype['default_fields']
+        default_fields.update(EditorialModel.classtypes.common_fields)
+        for fname, fdatas in default_fields.items():
             if not (fname in [ f.name for f in emclass.fields() ]):
                 #Adding the field
                 fdatas['name'] = fname

EditorialModel/test/test_classes.py

@@ -8,15 +8,14 @@ import logging
 from unittest import TestCase
 import unittest
 
+import EditorialModel
 from EditorialModel.classes import EmClass
 from EditorialModel.classtypes import EmClassType
 from EditorialModel.fieldgroups import EmFieldGroup
 from EditorialModel.types import EmType
 from EditorialModel.fields import EmField
-#import EditorialModel.fieldtypes as fieldTypes
 from EditorialModel.model import Model
 from EditorialModel.backend.json_backend import EmBackendJson
-#from EditorialModel.migrationhandler.django import DjangoMigrationHandler
 from EditorialModel.migrationhandler.dummy import DummyMigrationHandler
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Lodel.settings")
@@ -69,6 +68,21 @@ class TestEmClassCreation(ClassesTestCase):
         # the classtype should have the name of the EmClassType
         test_class = EM_TEST_OBJECT.component(test_class.uid)
         self.assertEqual(test_class.classtype, EmClassType.entity['name'])
+    
+    def test_default_fields(self):
+        """ Test if the default + common_fields are created when an EmClass is created """
+        classtype = EmClassType.entity['name']
+        test_class = EM_TEST_OBJECT.create_component(EmClass.__name__, {'name': 'testdefaultfieldclass', 'classtype': classtype})
+        ctype = EditorialModel.classtypes.EmClassType.get(classtype)
+        default_fields = ctype['default_fields']
+        default_fields.update(EditorialModel.classtypes.common_fields)
+        
+        fgs = test_class.fieldgroups()
+        self.assertEqual(len(fgs), 1, "Only one fieldgroup should be created when an EmClass is created")
+        self.assertEqual(fgs[0].name, EmClass.default_fieldgroup)
+        fnames = [ f.name for f in fgs[0].fields() ]
+        self.assertEqual(sorted(fnames), sorted(list(default_fields.keys())))
+            
 
 
 # Testing class deletion (and associated table drop)