summaryrefslogtreecommitdiff
path: root/ishtar_common/data_importer.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-09 23:36:36 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-09 23:36:36 +0100
commit8eb09a666e7048ce8e531649566418670d94036d (patch)
tree7a886afebba1df5ecf69524a5b4d0373eff7c3f9 /ishtar_common/data_importer.py
parent54779a8fa14fa5213ef62b85c767545dd4f15257 (diff)
parent02acc8610f34968cdeff8ea9cdd2129b36aa4809 (diff)
downloadIshtar-8eb09a666e7048ce8e531649566418670d94036d.tar.bz2
Ishtar-8eb09a666e7048ce8e531649566418670d94036d.zip
Merge branch 'master' into v0.9
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,