summaryrefslogtreecommitdiff
path: root/ishtar_common/data_importer.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-06-25 18:23:59 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-06-25 18:23:59 +0200
commit01db23a883983912d6998f6be71d3bd6a9a61b8d (patch)
treed33d97722d748f5987ca0e997d3bda4c8917d457 /ishtar_common/data_importer.py
parentd5b369ec8841a6bbffc4caf44dc90743c96bb18c (diff)
downloadIshtar-01db23a883983912d6998f6be71d3bd6a9a61b8d.tar.bz2
Ishtar-01db23a883983912d6998f6be71d3bd6a9a61b8d.zip
Import: fix MCC find imports + tests
Diffstat (limited to 'ishtar_common/data_importer.py')
-rw-r--r--ishtar_common/data_importer.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index b5fc9b0c6..27714458b 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -437,7 +437,7 @@ class Importer(object):
u"and encoding are similar to the ones used by the reference "
u"file."),
'too_many_cols':_(u"Too many cols (%(user_col)d) when "
- u"maximum is %(ref_col)d"),
+ u"maximum is %(ref_col)d"),
'no_data':_(u"No data provided"),
'value_required':_(u"Value is required"),
'not_enough_cols':_(u"At least %d columns must be filled"),
@@ -794,6 +794,8 @@ class Importer(object):
model = field_object.rel.to
elif hasattr(field_object, 'to'):
model = field_object.to
+ elif hasattr(field_object, 'model'):
+ model = field_object.model
if type(many_values) not in (list, tuple):
many_values = [many_values]
for val in many_values:
@@ -808,6 +810,7 @@ class Importer(object):
for key in val.keys():
if type(val[key]) not in (list, tuple):
default_dict[key] = val[key]
+ vals.append(default_dict.copy())
## manage multiple values
for key in val.keys():
if type(val[key]) in (list, tuple):