yannweb/lodel2_mirror
1
0
Fork 0
mirror of https://github.com/yweber/lodel2.git synced 2026-03-23 19:42:02 +01:00
Code Releases Activity

Fixing test and EmClass

Browse source 
- Now returning automatic common field classname in fields method
This commit is contained in:
Yann 2016-06-10 09:51:09 +02:00
commit 30bc9eec08
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lodel/editorial_model/components.py
View file

@ -132,8 +132,6 @@ class EmClass(EmComponent):
# @todo use Settings.editorialmodel.groups to determine wich fields should be returned # @todo use Settings.editorialmodel.groups to determine wich fields should be returned
def fields(self, uid = None, no_parents = False): def fields(self, uid = None, no_parents = False):
fields = self.__fields if no_parents else self.__all_fields fields = self.__fields if no_parents else self.__all_fields
if CLASS_ID_FIELDNAME in fields:
del(fields[CLASS_ID_FIELDNAME])
try: try:
return list(fields.values()) if uid is None else fields[uid] return list(fields.values()) if uid is None else fields[uid]
except KeyError: except KeyError:

5
tests/editorial_model/test_model.py
View file

@ -74,12 +74,13 @@ class EmClassTestCase(unittest.TestCase):
cls.new_field('name', data_handler = 'varchar') cls.new_field('name', data_handler = 'varchar')
cls.new_field('string', data_handler = 'varchar') cls.new_field('string', data_handler = 'varchar')
cls.new_field('lodel_id', data_handler = 'varchar') cls.new_field('lodel_id', data_handler = 'varchar')
#Automatic field added
fields = cls.fields() fields = cls.fields()
self.assertEqual(len(fields), 3) self.assertEqual(len(fields), 4)
self.assertEqual( self.assertEqual(
set([f.uid for f in fields]), set([f.uid for f in fields]),
set(['name', 'string', 'lodel_id']) set(['name', 'string', 'lodel_id', 'classname'])
) )
def test_d_hash(self): def test_d_hash(self):