From df0a39d596aa5e3af33135a01ee77e78ee2460a1 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Tue, 8 Dec 2015 18:09:36 +0100 Subject: [PATCH] Fixes in tests and webmodel --- cromosoma/webmodel.py | 11 ++++++++++- tests/webmodeltest.py | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cromosoma/webmodel.py b/cromosoma/webmodel.py index 36cbce9..ca781f3 100644 --- a/cromosoma/webmodel.py +++ b/cromosoma/webmodel.py @@ -383,8 +383,16 @@ class WebModel: 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) + 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) @@ -393,6 +401,7 @@ class WebModel: for row in cursor: results[row[self.name_field_id]]=row + del_row_id(results[row[self.name_field_id]]) return results diff --git a/tests/webmodeltest.py b/tests/webmodeltest.py index f2c8099..88d9367 100644 --- a/tests/webmodeltest.py +++ b/tests/webmodeltest.py @@ -49,6 +49,8 @@ class TestWebModelMethods(unittest.TestCase): 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.reset_conditions() @@ -61,7 +63,6 @@ class TestWebModelMethods(unittest.TestCase): self.assertEqual(row, {'id': 1, 'title': 'Example title Updated', 'content': 'New content Updated'}) - self.assertTrue(model.element_exists(1)) self.assertTrue(model.drop())