|
@@ -15,7 +15,8 @@ import EditorialModel
|
15
|
15
|
|
16
|
16
|
## @brief Manipulate Classes of the Editorial Model
|
17
|
17
|
# Create classes of object.
|
18
|
|
-#@see EmClass, EmType, EmFieldGroup, EmField
|
|
18
|
+# @see EmClass, EmType, EmFieldGroup, EmField
|
|
19
|
+# @todo sortcolumn handling
|
19
|
20
|
class EmClass(EmComponent):
|
20
|
21
|
|
21
|
22
|
table = 'em_class'
|
|
@@ -25,7 +26,7 @@ class EmClass(EmComponent):
|
25
|
26
|
# @see EditorialModel::components::EmComponent::_fields
|
26
|
27
|
_fields = [
|
27
|
28
|
('classtype', ftypes.EmField_char),
|
28
|
|
- ('icon', ftypes.EmField_integer),
|
|
29
|
+ ('icon', ftypes.EmField_icon),
|
29
|
30
|
('sortcolumn', ftypes.EmField_char)
|
30
|
31
|
]
|
31
|
32
|
|
|
@@ -35,17 +36,15 @@ class EmClass(EmComponent):
|
35
|
36
|
# @return An EmClass instance
|
36
|
37
|
# @throw EmComponentExistError if an EmClass with this name and a different classtype exists
|
37
|
38
|
@classmethod
|
38
|
|
- def create(cls, name, class_type):
|
39
|
|
- return cls._create_db(name, class_type)
|
|
39
|
+ def create(cls, name, classtype, icon=None, sortcolumn='rank', **em_component_args):
|
|
40
|
+ return cls._create_db(name=name, classtype=classtype['name'], icon=icon, sortcolumn=sortcolumn, **em_component_args)
|
40
|
41
|
|
41
|
42
|
@classmethod
|
42
|
43
|
## Isolate SQL for EmClass::create
|
43
|
|
- # @todo Remove hardcoded default value for icon
|
44
|
44
|
# @return An instance of EmClass
|
45
|
|
- def _create_db(cls, name, class_type):
|
|
45
|
+ def _create_db(cls, name, classtype, icon, sortcolumn, **em_component_args):
|
46
|
46
|
#Create a new entry in the em_class table
|
47
|
|
- values = {'name': name, 'classtype': class_type['name'], 'icon': 0}
|
48
|
|
- result = super(EmClass, cls).create(**values)
|
|
47
|
+ result = super(EmClass, cls).create(name=name, classtype=classtype, icon=icon, sortcolumn=sortcolumn, **em_component_args)
|
49
|
48
|
|
50
|
49
|
dbe = result.db_engine()
|
51
|
50
|
conn = dbe.connect()
|
|
@@ -162,3 +161,4 @@ class EmClass(EmComponent):
|
162
|
161
|
linked_types.append(EditorialModel.types.EmType(table_name_elements[1]))
|
163
|
162
|
|
164
|
163
|
return linked_types
|
|
164
|
+
|