Default fields processing changes + updated the me.json

Now on load default fields for EmClass are created. The EmClass.check method create them if they are not present.

EditorialModel/backend/json_backend.py

@@ -42,7 +42,6 @@ class EmBackendJson(EmBackendDummy):
         'rel_to_type_id': int_or_none,
         'rel_field_id': int_or_none,
         'optional': bool,
-        'internal': bool,
         'string': MlString.load,
         'help_text': MlString.load,
         'date_create': date_cast,
@@ -90,7 +89,7 @@ class EmBackendJson(EmBackendDummy):
     ## Saves the data in the data source json file
     # @param filename str : The filename to save the EM in (if None use self.json_file provided at init )
     def save(self, model, filename=None):
-        json_dump = json.dumps({component.uid: component.attr_flat() for component in model.components()}, default=self.date_handler)
+        json_dump = json.dumps({component.uid: component.attr_flat() for component in model.components()}, default=self.date_handler, indent=True)
         if self._json_file:
             with open(self._json_file if filename is None else filename, 'w') as json_file:
                 json_file.write(json_dump)

EditorialModel/classes.py

@@ -3,11 +3,9 @@
 ## @file classes.py
 # @see EditorialModel::classes::EmClass
 
+import EditorialModel
 from EditorialModel.components import EmComponent
 from EditorialModel.classtypes import EmClassType
-#from EditorialModel.exceptions import *
-#import EditorialModel.fieldtypes as ftypes
-import EditorialModel
 
 
 ## @brief Manipulate Classes of the Editorial Model
@@ -35,9 +33,22 @@ class EmClass(EmComponent):
         super(EmClass, self).__init__(model=model, uid=uid, name=name, string=string, help_text=help_text, date_update=date_update, date_create=date_create, rank=rank)
 
     ## Check if the EmComponent is valid
+    # @note this function add default and common fields to the EmClass if they are not yet created
     # @throw EmComponentCheckError if fails
     def check(self):
+        for fname in self.default_fields_list().keys():
+            if fname not in [f.name for f in self.fields()]:
+                self.model.add_default_class_fields(self.uid)
         super(EmClass, self).check()
+    
+    ## @brief Return the default fields list for this EmClass
+    # @return a dict with key = fieldname and value is a dict to pass to the EditorialModel::model::Model::creat_component() method
+    def default_fields_list(self):
+        ctype = EditorialModel.classtypes.EmClassType.get(self.classtype)
+        res = ctype['default_fields']
+        res.update(EditorialModel.classtypes.common_fields)
+        return res
+        
 
     ## @brief Delete a class if it's ''empty''
     # If a class has no fieldgroups delete it

EditorialModel/classtypes.py

@@ -4,20 +4,20 @@
 common_fields = {
     'lodel_id': {
         'fieldtype': 'pk',
-        'internal': 'object',
+        'internal': 'automatic',
     },
     'classid': {
         'fieldtype': 'integer',
-        'internal': 'object',
+        'internal': 'automatic',
     },
     'typeid': {
         'fieldtype': 'integer',
-        'internal': 'object',
+        'internal': 'automatic',
     },
     'string': {
         'fieldtype': 'char',
         'max_length': 128,
-        'internal': 'object',
+        'internal': 'automatic',
     },
 }
 

EditorialModel/fields.py

@@ -40,7 +40,7 @@ class EmField(EmComponent):
         if not internal:
             self.internal = False
         else:
-            if internal.lower() not in ['object', 'automatic']:
+            if internal.lower() not in ['automatic']:
                 raise ValueError("The internal arguments possible values are : [False, 'object', 'automatic']")
             self.internal = internal.lower()
 
@@ -57,6 +57,10 @@ class EmField(EmComponent):
         self.fieldtype = fieldtype
         self._fieldtype_args = kwargs
         self._fieldtype_args.update({'nullable' : nullable, 'uniq' : uniq})
+        #If internal is set, give it to the fieldtype
+        if self.internal:
+            self._fieldtype_args['internal'] = self.internal
+
         try:
             fieldtype_instance = self._fieldtype_cls(**self._fieldtype_args)
         except AttributeError as e:

EditorialModel/fieldtypes/pk.py

@@ -12,6 +12,7 @@ class EmFieldType(EditorialModel.fieldtypes.integer.EmFieldType):
             'default': None,
             'nullable': False,
             'uniq': False,
+            'internal': 'automatic',
         }
         # Checking args
         for name, value in kwargs.items():

EditorialModel/model.py

@@ -92,7 +92,8 @@ class Model(object):
             self.sort_components(component_class)
 
         #Check integrity
-        for uid, component in self._components['uids'].items():
+        loaded_comps = [(uid, component) for uid, component in self._components['uids'].items()]
+        for uid, component in loaded_comps:
             try:
                 component.check()
             except EmComponentCheckError as exception_object:
@@ -106,9 +107,14 @@ class Model(object):
         return self.backend.save(self, filename)
 
     ## Given a EmComponent child class return a list of instances
-    # @param cls EmComponent : A python class
+    # @param cls EmComponent|str : A python class
     # @return a list of instances or False if the class is not an EmComponent child
+    # @todo better implementation
     def components(self, cls=None):
+        if isinstance(cls, str):
+            cls = self.emclass_from_name(cls)
+            if not cls:
+                return False
         if cls is None:
             return [ self.component(uid) for uid in self._components['uids'] ]
         key_name = self.name_from_emclass(cls)
@@ -120,6 +126,24 @@ class Model(object):
     def component(self, uid):
         return False if uid not in self._components['uids'] else self._components['uids'][uid]
 
+    ## @brief Search in all the editorial model for a component with a specific name
+    # @param name str : the searched name
+    # @param comp_cls str|EmComponent : filter on component type (see components() method)
+    # @return a list of component with a specific name
+    def component_from_name(self, name, comp_cls = None):
+        if comp_cls == EmField or comp_cls == 'EmField':
+            res = list()
+            for field, fieldname in [ (f, f.name) for f in self.components('EmField')]:
+                if fieldname == name:
+                    res.append(field)
+            return res
+
+        for comp,compname in [ (c, c.name) for c in self.components(comp_cls)]:
+            if compname == name:
+                return comp
+
+        return False
+
     ## Sort components by rank in Model::_components
     # @param emclass pythonClass : The type of components to sort
     # @throw AttributeError if emclass is not valid
@@ -215,9 +239,7 @@ class Model(object):
                     fgid = fg.uid
                     break
 
-        ctype = EditorialModel.classtypes.EmClassType.get(emclass.classtype)
-        default_fields = ctype['default_fields']
-        default_fields.update(EditorialModel.classtypes.common_fields)
+        default_fields = emclass.default_fields_list()
         for fname, fdatas in default_fields.items():
             if not (fname in [ f.name for f in emclass.fields() ]):
                 #Adding the field

EditorialModel/test/me.json

@@ -1,65 +1,548 @@
 {
-  "1" : {
-    "component":"EmClass", "name":"textes", "string":"{\"fre\":\"Texte\"}", "help_text":"{}", "rank":"1", "date_update":"", "date_create":"", "classtype":"entity", "icon":"0", "sortcolumn":"rank"
+ "1": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "classtype": "entity",
+  "string": "{\"fre\": \"Texte\"}",
+  "icon": "0",
+  "help_text": "",
+  "name": "textes",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "sortcolumn": "rank",
+  "component": "EmClass",
+  "rank": 1
+ },
+ "2": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "classtype": "person",
+  "string": "{\"fre\": \"Personnes\"}",
+  "icon": "0",
+  "help_text": "",
+  "name": "personnes",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "sortcolumn": "rank",
+  "component": "EmClass",
+  "rank": 1
+ },
+ "3": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "string": "{\"fre\": \"Info\"}",
+  "class_id": 1,
+  "help_text": "",
+  "name": "info",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 1,
+  "component": "EmFieldGroup"
+ },
+ "4": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "{\"fre\": \"Titre\"}",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 1,
+  "fieldgroup_id": 3,
+  "nullable": false,
+  "fieldtype": "char",
+  "uniq": false,
+  "name": "titre",
+  "internal": false,
+  "component": "EmField"
+ },
+ "5": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "string": "{\"fre\": \"Article\"}",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "sortcolumn": "rank",
+  "fields_list": [
+   7
+  ],
+  "rank": 1,
+  "class_id": 1,
+  "superiors_list": {
+   "parent": [
+    14
+   ]
   },
-  "2" : {
-    "component":"EmClass", "name":"personnes", "string":"{\"fre\":\"Personnes\"}", "help_text":"{}", "rank":"1", "date_update":"", "date_create":"", "classtype":"person", "icon":"0", "sortcolumn":"rank"
+  "name": "article",
+  "component": "EmType"
+ },
+ "6": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "string": "{\"fre\": \"Personne\"}",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "sortcolumn": "rank",
+  "fields_list": [
+   10
+  ],
+  "rank": 1,
+  "class_id": 2,
+  "superiors_list": {},
+  "name": "personne",
+  "component": "EmType"
+ },
+ "7": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": true,
+  "string": "{\"fre\": \"Sous-titre\"}",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 2,
+  "fieldgroup_id": 3,
+  "nullable": false,
+  "fieldtype": "char",
+  "uniq": false,
+  "name": "soustitre",
+  "internal": false,
+  "component": "EmField"
+ },
+ "8": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "string": "{\"fre\": \"Civilit\\u00e9\"}",
+  "class_id": 2,
+  "help_text": "",
+  "name": "civilit\u00e9",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 1,
+  "component": "EmFieldGroup"
+ },
+ "9": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "{\"fre\": \"Nom\"}",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 1,
+  "fieldgroup_id": 8,
+  "nullable": false,
+  "fieldtype": "char",
+  "uniq": false,
+  "name": "nom",
+  "internal": false,
+  "component": "EmField"
+ },
+ "10": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": true,
+  "string": "{\"fre\": \"Pr\\u00e9nom\"}",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 2,
+  "fieldgroup_id": 8,
+  "nullable": false,
+  "fieldtype": "char",
+  "uniq": false,
+  "name": "prenom",
+  "internal": false,
+  "component": "EmField"
+ },
+ "11": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "{\"fre\": \"Auteur\"}",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 1,
+  "fieldgroup_id": 17,
+  "nullable": false,
+  "fieldtype": "rel2type",
+  "rel_to_type_id": 6,
+  "uniq": false,
+  "name": "auteur",
+  "internal": false,
+  "component": "EmField"
+ },
+ "12": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": 11,
+  "optional": false,
+  "string": "{\"fre\": \"Adresse\"}",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 2,
+  "fieldgroup_id": 17,
+  "nullable": false,
+  "fieldtype": "char",
+  "uniq": false,
+  "name": "adresse",
+  "internal": false,
+  "component": "EmField"
+ },
+ "13": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "classtype": "entity",
+  "string": "{\"fre\": \"Publication\"}",
+  "icon": "0",
+  "help_text": "",
+  "name": "publication",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "sortcolumn": "rank",
+  "component": "EmClass",
+  "rank": 2
+ },
+ "14": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "string": "{\"fre\": \"Rubrique\"}",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "sortcolumn": "rank",
+  "fields_list": [],
+  "rank": 1,
+  "class_id": 13,
+  "superiors_list": {
+   "parent": [
+    14,
+    19
+   ]
   },
-  "3" : {
-    "component":"EmFieldGroup", "name":"info", "string":"{\"fre\":\"Info\"}", "help_text":"{}", "rank":"1", "date_update":"", "date_create":"", "class_id":"1"
-  },
-  "4" : {
-    "component":"EmField", "name":"titre", "string":"{\"fre\":\"Titre\"}", "help_text":"{}", "rank":"1", "date_update":"", "date_create":"", "fieldtype":"char", "fieldgroup_id":"3", "rel_field_id":"", "optional":0, "internal":"", "icon":"0"
-  },
-  "5" : {
-    "component":"EmType", "name":"article", "string":"{\"fre\":\"Article\"}", "help_text":"{}", "rank":"1", "date_update":"", "date_create":"", "class_id":"1", "icon":"0", "sortcolumn":"rank", "fields_list":[7], "superiors_list":{"parent":[14]}
-  },
-  "6" : {
-    "component":"EmType", "name":"personne", "string":"{\"fre\":\"Personne\"}", "help_text":"{}", "rank":"1", "date_update":"", "date_create":"", "class_id":"2", "icon":"0", "sortcolumn":"rank", "fields_list":[10]
-  },
-  "7" : {
-    "component":"EmField", "name":"soustitre", "string":"{\"fre\":\"Sous-titre\"}", "help_text":"{}", "rank":"2", "date_update":"", "date_create":"", "fieldtype":"char", "fieldgroup_id":"3", "rel_field_id":"", "optional":1, "internal":"", "icon":"0"
-  },
-  "8" : {
-    "component":"EmFieldGroup", "name":"civilité", "string":"{\"fre\":\"Civilité\"}", "help_text":"{}", "rank":"1", "date_update":"", "date_create":"", "class_id":"2"
-  },
-  "9" : {
-    "component":"EmField", "name":"nom", "string":"{\"fre\":\"Nom\"}", "help_text":"{}", "rank":"1", "date_update":"", "date_create":"", "fieldtype":"char", "fieldgroup_id":"8", "rel_field_id":"", "optional":0, "internal":"", "icon":"0"
-  },
-  "10" : {
-    "component":"EmField", "name":"prenom", "string":"{\"fre\":\"Prénom\"}", "help_text":"{}", "rank":"2", "date_update":"", "date_create":"", "fieldtype":"char", "fieldgroup_id":"8", "rel_field_id":"", "optional":1, "internal":"", "icon":"0"
-  },
-  "11" : {
-    "component":"EmField", "name":"auteur", "string":"{\"fre\":\"Auteur\"}", "help_text":"{}", "rank":"1", "date_update":"", "date_create":"", "fieldtype":"rel2type", "fieldgroup_id":"17", "rel_to_type_id":"6", "rel_field_id":"", "optional":0, "internal":"", "icon":"0"
-  },
-  "12" : {
-    "component":"EmField", "name":"adresse", "string":"{\"fre\":\"Adresse\"}", "help_text":"{}", "rank":"2", "date_update":"", "date_create":"", "fieldtype":"char", "fieldgroup_id":"17", "rel_field_id":"11", "optional":0, "internal":"", "icon":"0"
-  },
-  "13" : {
-    "component":"EmClass", "name":"publication", "string":"{\"fre\":\"Publication\"}", "help_text":"{}", "rank":"2", "date_update":"", "date_create":"", "classtype":"entity", "icon":"0", "sortcolumn":"rank"
-  },
-  "14" : {
-    "component":"EmType", "name":"rubrique", "string":"{\"fre\":\"Rubrique\"}", "help_text":"{}", "rank":"1", "date_update":"", "date_create":"", "class_id":"13", "icon":"0", "sortcolumn":"rank", "superiors_list":{"parent":[14, 19]}
-  },
-  "15" : {
-    "component":"EmFieldGroup", "name":"info", "string":"{\"fre\":\"Info\"}", "help_text":"{}", "rank":"1", "date_update":"", "date_create":"", "class_id":"13"
-  },
-  "16" : {
-    "component":"EmField", "name":"titre", "string":"{\"fre\":\"Titre\"}", "help_text":"{}", "rank":"1", "date_update":"", "date_create":"", "fieldtype":"char", "fieldgroup_id":"15", "rel_field_id":"", "optional":0, "internal":"", "icon":"0"
-  },
-  "17" : {
-    "component":"EmFieldGroup", "name":"gens", "string":"{\"fre\":\"Gens\"}", "help_text":"{}", "rank":"2", "date_update":"", "date_create":"", "class_id":"1"
-  },
-  "18" : {
-    "component":"EmField", "name":"age", "string":"{\"fre\":\"Age\"}", "help_text":"{}", "rank":"3", "date_update":"", "date_create":"", "fieldtype":"char", "fieldgroup_id":"8", "rel_field_id":"", "optional":1, "internal":"", "icon":"0"
-  },
-  "19" : {
-    "component":"EmType", "name":"numero", "string":"{\"fre\":\"Numéro\"}", "help_text":"{}", "rank":"2", "date_update":"", "date_create":"", "class_id":"13", "icon":"0", "sortcolumn":"rank"
-  },
-  "20" : {
-    "component":"EmFieldGroup", "name":"couleurs", "string":"{\"fre\":\"Couleurs\"}", "help_text":"{}", "rank":"3", "date_update":"", "date_create":"", "class_id":"1"
-  },
-  "21" : {
-    "component":"EmField", "name":"bleu", "string":"{\"fre\":\"Bleu\"}", "help_text":"{}", "rank":"1", "date_update":"", "date_create":"", "fieldtype":"char", "fieldgroup_id":"20", "rel_field_id":"", "optional":1, "internal":"", "icon":"0"
-  }
-}
+  "name": "rubrique",
+  "component": "EmType"
+ },
+ "15": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "string": "{\"fre\": \"Info\"}",
+  "class_id": 13,
+  "help_text": "",
+  "name": "info",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 1,
+  "component": "EmFieldGroup"
+ },
+ "16": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "{\"fre\": \"Titre\"}",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 1,
+  "fieldgroup_id": 15,
+  "nullable": false,
+  "fieldtype": "char",
+  "uniq": false,
+  "name": "titre",
+  "internal": false,
+  "component": "EmField"
+ },
+ "17": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "string": "{\"fre\": \"Gens\"}",
+  "class_id": 1,
+  "help_text": "",
+  "name": "gens",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 2,
+  "component": "EmFieldGroup"
+ },
+ "18": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": true,
+  "string": "{\"fre\": \"Age\"}",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 3,
+  "fieldgroup_id": 8,
+  "nullable": false,
+  "fieldtype": "char",
+  "uniq": false,
+  "name": "age",
+  "internal": false,
+  "component": "EmField"
+ },
+ "19": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "string": "{\"fre\": \"Num\\u00e9ro\"}",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "sortcolumn": "rank",
+  "fields_list": [],
+  "rank": 2,
+  "class_id": 13,
+  "superiors_list": {},
+  "name": "numero",
+  "component": "EmType"
+ },
+ "20": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "string": "{\"fre\": \"Couleurs\"}",
+  "class_id": 1,
+  "help_text": "",
+  "name": "couleurs",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 3,
+  "component": "EmFieldGroup"
+ },
+ "21": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": true,
+  "string": "{\"fre\": \"Bleu\"}",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 1,
+  "fieldgroup_id": 20,
+  "nullable": false,
+  "fieldtype": "char",
+  "uniq": false,
+  "name": "bleu",
+  "internal": false,
+  "component": "EmField"
+ },
+ "22": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "string": "",
+  "class_id": 1,
+  "help_text": "",
+  "name": "_default",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 4,
+  "component": "EmFieldGroup"
+ },
+ "23": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 0,
+  "fieldgroup_id": 22,
+  "nullable": false,
+  "fieldtype": "integer",
+  "uniq": false,
+  "name": "classid",
+  "internal": "automatic",
+  "component": "EmField"
+ },
+ "24": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 1,
+  "fieldgroup_id": 22,
+  "nullable": false,
+  "fieldtype": "char",
+  "max_length": 128,
+  "uniq": false,
+  "name": "string",
+  "internal": "automatic",
+  "component": "EmField"
+ },
+ "25": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 2,
+  "fieldgroup_id": 22,
+  "nullable": false,
+  "fieldtype": "integer",
+  "uniq": false,
+  "name": "typeid",
+  "internal": "automatic",
+  "component": "EmField"
+ },
+ "26": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 3,
+  "fieldgroup_id": 22,
+  "nullable": false,
+  "fieldtype": "pk",
+  "uniq": false,
+  "name": "lodel_id",
+  "internal": "automatic",
+  "component": "EmField"
+ },
+ "27": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "string": "",
+  "class_id": 2,
+  "help_text": "",
+  "name": "_default",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 2,
+  "component": "EmFieldGroup"
+ },
+ "28": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 0,
+  "fieldgroup_id": 27,
+  "nullable": false,
+  "fieldtype": "integer",
+  "uniq": false,
+  "name": "classid",
+  "internal": "automatic",
+  "component": "EmField"
+ },
+ "29": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 1,
+  "fieldgroup_id": 27,
+  "nullable": false,
+  "fieldtype": "char",
+  "max_length": 128,
+  "uniq": false,
+  "name": "string",
+  "internal": "automatic",
+  "component": "EmField"
+ },
+ "30": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 2,
+  "fieldgroup_id": 27,
+  "nullable": false,
+  "fieldtype": "integer",
+  "uniq": false,
+  "name": "typeid",
+  "internal": "automatic",
+  "component": "EmField"
+ },
+ "31": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 3,
+  "fieldgroup_id": 27,
+  "nullable": false,
+  "fieldtype": "pk",
+  "uniq": false,
+  "name": "lodel_id",
+  "internal": "automatic",
+  "component": "EmField"
+ },
+ "32": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "string": "",
+  "class_id": 13,
+  "help_text": "",
+  "name": "_default",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 2,
+  "component": "EmFieldGroup"
+ },
+ "33": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 0,
+  "fieldgroup_id": 32,
+  "nullable": false,
+  "fieldtype": "integer",
+  "uniq": false,
+  "name": "classid",
+  "internal": "automatic",
+  "component": "EmField"
+ },
+ "34": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 1,
+  "fieldgroup_id": 32,
+  "nullable": false,
+  "fieldtype": "char",
+  "max_length": 128,
+  "uniq": false,
+  "name": "string",
+  "internal": "automatic",
+  "component": "EmField"
+ },
+ "35": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 2,
+  "fieldgroup_id": 32,
+  "nullable": false,
+  "fieldtype": "integer",
+  "uniq": false,
+  "name": "typeid",
+  "internal": "automatic",
+  "component": "EmField"
+ },
+ "36": {
+  "date_update": "Fri Oct 16 11:05:04 2015",
+  "rel_field_id": null,
+  "optional": false,
+  "string": "",
+  "icon": "0",
+  "help_text": "",
+  "date_create": "Fri Oct 16 11:05:04 2015",
+  "rank": 3,
+  "fieldgroup_id": 32,
+  "nullable": false,
+  "fieldtype": "pk",
+  "uniq": false,
+  "name": "lodel_id",
+  "internal": "automatic",
+  "component": "EmField"
+ }
+}

EditorialModel/test/test_classes.py

@@ -54,9 +54,6 @@ class TestEmClassCreation(ClassesTestCase):
         ClassesTestCase.setUpClass()
         test_class = EM_TEST_OBJECT.create_component(EmClass.__name__, {'name': 'testclass1', 'classtype': EmClassType.entity['name']})
 
-        #We check the uid
-        self.assertEqual(test_class.uid, 22)
-
         # We check that the class has been added in the right list in the model object
         class_components_records = EM_TEST_OBJECT.components(EmClass)
         self.assertIn(test_class, class_components_records)