Changed icon field to EmField_icon in EmClass and EmField. Added sortcolumn argument for EmType and EmClass.

EditorialModel/classes.py

@@ -15,7 +15,8 @@ import EditorialModel
 
 ## @brief Manipulate Classes of the Editorial Model
 # Create classes of object.
-#@see EmClass, EmType, EmFieldGroup, EmField
+# @see EmClass, EmType, EmFieldGroup, EmField
+# @todo sortcolumn handling
 class EmClass(EmComponent):
 
     table = 'em_class'
@@ -25,7 +26,7 @@ class EmClass(EmComponent):
     # @see EditorialModel::components::EmComponent::_fields
     _fields = [
         ('classtype', ftypes.EmField_char),
-        ('icon', ftypes.EmField_integer),
+        ('icon', ftypes.EmField_icon),
         ('sortcolumn', ftypes.EmField_char)
     ]
 
@@ -35,17 +36,15 @@ class EmClass(EmComponent):
     # @return An EmClass instance
     # @throw EmComponentExistError if an EmClass with this name and a different classtype exists
     @classmethod
-    def create(cls, name, class_type):
-        return cls._create_db(name, class_type)
+    def create(cls, name, classtype, icon=None, sortcolumn='rank', **em_component_args):
+        return cls._create_db(name=name, classtype=classtype['name'], icon=icon, sortcolumn=sortcolumn, **em_component_args)
 
     @classmethod
     ## Isolate SQL for EmClass::create
-    # @todo Remove hardcoded default value for icon
     # @return An instance of EmClass
-    def _create_db(cls, name, class_type):
+    def _create_db(cls, name, classtype, icon, sortcolumn, **em_component_args):
         #Create a new entry in the em_class table
-        values = {'name': name, 'classtype': class_type['name'], 'icon': 0}
-        result = super(EmClass, cls).create(**values)
+        result = super(EmClass, cls).create(name=name, classtype=classtype, icon=icon, sortcolumn=sortcolumn, **em_component_args)
 
         dbe = result.db_engine()
         conn = dbe.connect()
@@ -162,3 +161,4 @@ class EmClass(EmComponent):
                 linked_types.append(EditorialModel.types.EmType(table_name_elements[1]))
 
         return linked_types
+

EditorialModel/fields.py

@@ -1,7 +1,7 @@
 #-*- coding: utf-8 -*-
 
 from EditorialModel.components import EmComponent, EmComponentNotExistError
-from EditorialModel.fieldtypes import EmField_boolean, EmField_char, EmField_integer, get_field_type
+from EditorialModel.fieldtypes import EmField_boolean, EmField_char, EmField_integer, EmField_icon, get_field_type
 from EditorialModel.fieldgroups import EmFieldGroup
 from EditorialModel.classes import EmClass
 
@@ -30,7 +30,7 @@ class EmField(EmComponent):
         ('rel_field_id', EmField_integer),
         ('optional', EmField_boolean),
         ('internal', EmField_boolean),
-        ('icon', EmField_integer)
+        ('icon', EmField_icon)
     ]
 
     ## Create (Function)
@@ -55,7 +55,7 @@ class EmField(EmComponent):
     # @see EmComponent::__init__()
     # @staticmethod
     @classmethod
-    def create(cls, name, fieldgroup, fieldtype, optional=0, internal=0, rel_to_type_id=0, rel_field_id=0, icon=0, **em_component_args):
+    def create(cls, name, fieldgroup, fieldtype, optional=0, internal=0, rel_to_type_id=0, rel_field_id=0, icon=None, **em_component_args):
         created_field = super(EmField, cls).create(
             name=name,
             fieldgroup_id=fieldgroup.uid,

EditorialModel/types.py

@@ -17,6 +17,7 @@ import EditorialModel.classes
 # EmType with special fields called relation_to_type fields
 #
 # @see EditorialModel::components::EmComponent
+# @todo sortcolumn handling
 class EmType(EmComponent):
     table = 'em_type'
     table_hierarchy = 'em_type_hierarchy'
@@ -40,8 +41,8 @@ class EmType(EmComponent):
     # @see EmComponent::__init__()
     # 
     # @todo check that em_class is an EmClass object (fieldtypes can handle it)
-    def create(c, name, em_class, **em_component_args):
-        return super(EmType, c).create(name=name, class_id=em_class.uid, **em_component_args)
+    def create(c, name, em_class, sortcolumn='rank', **em_component_args):
+        return super(EmType, c).create(name=name, class_id=em_class.uid, sortcolumn=sortcolumn, **em_component_args)
 
     @property
     ## Return an sqlalchemy table for type hierarchy
@@ -220,11 +221,15 @@ class EmType(EmComponent):
     def _subOrSup(self, sup = True):
         conn = self.db_engine().connect()
         htable = self._table_hierarchy
+        type_table = sqlutils.get_table(self.__class__)
+
         req = htable.select()
         if sup:
-            req = req.where(htable.c.subordinate_id == self.uid)
+            col = htable.c.subordinate_id
         else:
-            req = req.where(htable.c.superior_id == self.uid)
+            col = htable.c.superior_id
+
+        req = req.where(col == self.uid)
         res = conn.execute(req)
         rows = res.fetchall()
         conn.close()