summaryrefslogtreecommitdiff
path: root/ishtar_common/data_importer.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-09 23:37:37 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-09 23:37:37 +0100
commit3763da60c34378809569c75715007b62669a580c (patch)
tree0573e1d0eb93eacf556b371d648603a915fdb82a /ishtar_common/data_importer.py
parentb22a1a4644932761b64b7f32e16733669659d731 (diff)
parent8eb09a666e7048ce8e531649566418670d94036d (diff)
downloadIshtar-3763da60c34378809569c75715007b62669a580c.tar.bz2
Ishtar-3763da60c34378809569c75715007b62669a580c.zip
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common/data_importer.py')
-rw-r--r--ishtar_common/data_importer.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index d4000b4c1..10957e74d 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -1406,6 +1406,10 @@ class Importer(object):
data.pop(attribute)
continue
if not data[attribute]:
+ field_object, model, direct, m2m = \
+ cls._meta.get_field_by_name(attribute)
+ if m2m:
+ data.pop(attribute)
continue
if attribute != '__force_new':
self.get_field(cls, attribute, data, m2ms, c_c_path,