EmType : implement .fields()

comment selected_fields because it clashes with ._fields[]
 => we have to rethink of ._fields[] and fieldtypes

EditorialModel/fieldgroups.py

@@ -37,12 +37,12 @@ class EmFieldGroup(EmComponent):
             em_type = self.model.component(type_id)
             fields = []
             for field in self.model.components(EmField):
-                if field.fieldgroup_id != self.uid or (field.optional and field.uid not in em_type._fields['fields']):
+                if field.fieldgroup_id != self.uid or (field.optional and field.uid not in em_type._fields['selected_fields']):
                     continue
                 # don't include relational field if parent should not be included
                 if field.rel_field_id:
                     parent = self.model.component(field.rel_field_id)
-                    if parent.optional and parent.uid not in em_type._fields['fields']:
+                    if parent.optional and parent.uid not in em_type._fields['selected_fields']:
                         continue
                 fields.append(field)
 

EditorialModel/test/me.json

@@ -12,10 +12,10 @@
     "component":"EmField", "name":"titre", "string":"{\"fre\":\"Titre\"}", "help":"{}", "rank":"1", "date_update":"", "date_create":"", "fieldtype":"", "fieldgroup_id":"3", "rel_to_type_id":"", "rel_field_id":"", "optional":"0", "internal":"", "icon":"0"
   },
   "5" : {
-    "component":"EmType", "name":"article", "string":"{\"fre\":\"Article\"}", "help":"{}", "rank":"1", "date_update":"", "date_create":"", "class_id":"1", "icon":"0", "sortcolumn":"rank", "fields":[7]
+    "component":"EmType", "name":"article", "string":"{\"fre\":\"Article\"}", "help":"{}", "rank":"1", "date_update":"", "date_create":"", "class_id":"1", "icon":"0", "sortcolumn":"rank", "selected_fields":[7]
   },
   "6" : {
-    "component":"EmType", "name":"personne", "string":"{\"fre\":\"Personne\"}", "help":"{}", "rank":"1", "date_update":"", "date_create":"", "class_id":"2", "icon":"0", "sortcolumn":"rank", "fields":[10]
+    "component":"EmType", "name":"personne", "string":"{\"fre\":\"Personne\"}", "help":"{}", "rank":"1", "date_update":"", "date_create":"", "class_id":"2", "icon":"0", "sortcolumn":"rank", "selected_fields":[10]
   },
   "7" : {
     "component":"EmField", "name":"soustitre", "string":"{\"fre\":\"Sous-titre\"}", "help":"{}", "rank":"2", "date_update":"", "date_create":"", "fieldtype":"", "fieldgroup_id":"3", "rel_to_type_id":"", "rel_field_id":"", "optional":"1", "internal":"", "icon":"0"

EditorialModel/types.py

@@ -34,7 +34,7 @@ class EmType(EmComponent):
 
     def __init__(self, data, model):
         super(EmType, self).__init__(data, model)
-        for link in ['fields', 'subordinates']:
+        for link in ['selected_fields', 'subordinates']:
             if link in data:
                 self._fields[link] = data[link]
             else:
@@ -89,18 +89,15 @@ class EmType(EmComponent):
 
     ## Return selected optional field
     # @return A list of EmField instance
-    def selected_fields(self):
-        selected = [self.model.component(field_id) for field_id in self._fields['fields']]
-        return selected
+    #def selected_fields(self):
+        #selected = [self.model.component(field_id) for field_id in self._fields['selected_fields']]
+        #return selected
 
     ## Return the list of associated fields
     # @return A list of EmField instance
     def fields(self):
-        result = list()
-        for field in self.all_fields():
-            if not field.optional:
-                result.append(field)
-        return result + self.selected_fields()
+        fields = [field for fieldgroup in self.fieldgroups() for field in fieldgroup.fields(self.uid)]
+        return fields
 
     ## Select_field (Function)
     #