Updated some fieldtypes and added a primary key (pk) fieldtype

EditorialModel/fields.py

@@ -19,16 +19,31 @@ class EmField(EmComponent):
     ranked_in = 'fieldgroup_id'
 
     ## Instanciate a new EmField
-    # @todo define and test type for icon and fieldtype
+    # @todo define and test type for icon
     # @warning nullable == True by default
+    # @param model Model : Editorial model
+    # @param uid int : Uniq id
+    # @param fieldtype str : Fieldtype name ( see Editorialmodel::fieldtypes )
+    # @param optional bool : Indicate if a field is optional or not
+    # @param internal str|bool : If False the field is not internal, else it can takes value in "object" or "automatic"
+    # @param rel_field_id int|None : If not None indicates that the field is a relation attribute (and the value is the UID of the rel2type field)
+    # @param nullable bool : If True None values are allowed
+    # @param default * : Default field value
+    # @param uniq bool : if True the value should be uniq in the db table
+    # @param **kwargs : more keywords arguments for the fieldtype
     def __init__(self, model, uid, name, fieldgroup_id, fieldtype, optional=False, internal=False, rel_field_id=None, icon='0', string=None, help_text=None, date_update=None, date_create=None, rank=None, nullable=True, default=None, uniq=False, **kwargs):
 
         self.fieldgroup_id = fieldgroup_id
         self.check_type('fieldgroup_id', int)
-        self.optional = optional
-        self.check_type('optional', bool)
-        self.internal = internal
-        self.check_type('internal', bool)
+        self.optional = bool(optional)
+
+        if not internal:
+            self.internal = False
+        else:
+            if internal.lower() not in ['object', 'automatic']:
+                raise ValueError("The internal arguments possible values are : [False, 'object', 'automatic']")
+            self.internal = internal.lower()
+
         self.rel_field_id = rel_field_id
         self.check_type('rel_field_id', (int, type(None)))
         self.icon = icon
@@ -59,7 +74,7 @@ class EmField(EmComponent):
     @staticmethod
     ## @brief Return the list of allowed field type
     def fieldtypes_list():
-        return [f for f in EditorialModel.fieldtypes.__all__ if f != '__init__']
+        return [f for f in EditorialModel.fieldtypes.__all__ if f != '__init__' and f != 'generic' ]
 
     ## @brief Get the fieldtype instance
     # @return a fieldtype instance

EditorialModel/fieldtypes/datetime.py

@@ -1,7 +1,6 @@
 #-*- coding: utf-8 -*-
 
-from EditorialModel.fieldtypes import GenericFieldType
-
+from EditorialModel.fieldtypes.generic import GenericFieldType
 
 class EmFieldType(GenericFieldType):
 

EditorialModel/fieldtypes/file.py

@@ -1,7 +1,6 @@
 #-*- coding: utf-8 -*-
 
-from EditorialModel.fieldtypes import GenericFieldType
-
+from EditorialModel.fieldtypes.generic import GenericFieldType
 
 class EmFieldType(GenericFieldType):
 

EditorialModel/fieldtypes/generic.py

@@ -16,11 +16,13 @@ class GenericFieldType(object):
     # @param default ? : The default value
     # @param nullable bool : is None allowed as value ?
     # @param check_function function : A callback check function that takes 1 argument and raise a TypeError if the validation fails
+    # @param uniq bool : Indicate if a field should handle uniq values
+    # @param primary bool : If true the field is a primary key
     # @param **kwargs dict : Other arguments
     # @throw NotImplementedError if called directly
     # @throw AttributeError if bad ftype
     # @throw AttributeError if bad check_function
-    def __init__(self, ftype, default = None, nullable = True, check_function = None, uniq = False, **kwargs):
+    def __init__(self, ftype, default = None, nullable = True, check_function = None, uniq = False, primary=False, **kwargs):
         if self.__class__ == GenericFieldType:
             raise NotImplementedError("Abstract class")
         

EditorialModel/fieldtypes/pk.py

@@ -0,0 +1,10 @@
+#-*- coding: utf-8 -*-
+
+import EditorialModel
+
+class EmFieldType(EditorialModel.fieldtypes.integer.EmFieldType):
+    
+    help = 'Integer primary key fieldtype'
+
+    def __init__(self):
+        super(EmFieldType, self).__init__(ftype='int', primary=True)

EditorialModel/fieldtypes/regexchar.py

@@ -1,7 +1,7 @@
 #-*- coding: utf-8 -*-
 
 import re
-import EditorialModel.fieldtypes.char.EmFieldType
+import EditorialModel
 
 class EmFieldType(EditorialModel.fieldtypes.char.EmFieldType):