paramecio/parameciofm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes in tests and webmodel

Browse source
This commit is contained in:
Antonio de la Rosa 2015-12-08 18:09:36 +01:00
parent 271c6c787a
commit df0a39d596
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cromosoma/webmodel.py
View file

@ -383,8 +383,16 @@ class WebModel:
def select_to_array(self, fields_selected=[], raw_query=0): def select_to_array(self, fields_selected=[], raw_query=0):
if len(fields_selected) > 0 and (self.name_field_id not in fields_selected): if len(fields_selected)==0:
fields_selected=self.fields.keys()
if (self.name_field_id not in fields_selected):
fields_selected.append(self.name_field_id) fields_selected.append(self.name_field_id)
def del_row_id(row):
del row[self.name_field_id]
else:
def del_row_id(row):
pass
cursor=self.select(fields_selected, raw_query) cursor=self.select(fields_selected, raw_query)
@ -393,6 +401,7 @@ class WebModel:
for row in cursor: for row in cursor:
results[row[self.name_field_id]]=row results[row[self.name_field_id]]=row
del_row_id(results[row[self.name_field_id]])
return results return results

3
tests/webmodeltest.py
View file

@ -49,6 +49,8 @@ class TestWebModelMethods(unittest.TestCase):
self.assertEqual(model.select_a_row_where(['title']), {'title': 'Example title Updated'}) self.assertEqual(model.select_a_row_where(['title']), {'title': 'Example title Updated'})
self.assertEqual(model.select_to_array(['title', 'content']), {1: {'title': 'Example title Updated', 'content': 'New content Updated'}})
model.yes_reset_conditions=True model.yes_reset_conditions=True
model.reset_conditions() model.reset_conditions()
@ -61,7 +63,6 @@ class TestWebModelMethods(unittest.TestCase):
self.assertEqual(row, {'id': 1, 'title': 'Example title Updated', 'content': 'New content Updated'}) self.assertEqual(row, {'id': 1, 'title': 'Example title Updated', 'content': 'New content Updated'})
self.assertTrue(model.element_exists(1)) self.assertTrue(model.element_exists(1))
self.assertTrue(model.drop()) self.assertTrue(model.drop())