Fix import_data for reference fields

This commit is contained in:
Nicolas Évrard committed 2012-10-09 17:42:02 +02:00
1 parent 3c827d8647
commit 52a4ee8e56
2 files changed
+16 -1

No files matched your search

+1 -1
View File
@@ -592,7 +592,7 @@ class ModelStorage(Model):
warn('too_many_relations_found', value, relation)
res = None
else:
res = '%s,%s' % (relation, str(res[0]))
res = '%s,%s' % (relation, res[0].id)
return res
def get_by_id(value):
+15
View File
@@ -364,19 +364,34 @@ class ImportDataTestCase(unittest.TestCase):
self.assertEqual(self.reference.import_data(['reference'],
[['test.import_data.reference.selection,Test']]),
(1, 0, 0, 0))
reference, = self.reference.search([])
self.assertEqual(reference.reference.__name__,
'test.import_data.reference.selection')
transaction.cursor.rollback()
self.assertEqual(self.reference.import_data(['reference:id'],
[['test.import_data.reference.selection,'
'test.import_data_reference_selection_test']]),
(1, 0, 0, 0))
reference, = self.reference.search([])
self.assertEqual(reference.reference.__name__,
'test.import_data.reference.selection')
transaction.cursor.rollback()
self.assertEqual(self.reference.import_data(['reference'],
[['']]), (1, 0, 0, 0))
reference, = self.reference.search([])
self.assertEqual(reference.reference, None)
transaction.cursor.rollback()
self.assertEqual(self.reference.import_data(['reference'],
[['test.import_data.reference.selection,Test'],
['test.import_data.reference.selection,Test']]),
(2, 0, 0, 0))
for reference in self.reference.search([]):
self.assertEqual(reference.reference.__name__,
'test.import_data.reference.selection')
transaction.cursor.rollback()
self.assertEqual(self.reference.import_data(['reference'],
[['test.import_data.reference.selection,foo']])[0], -1)