summaryrefslogtreecommitdiff
path: root/ishtar_common/data_importer.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-03-26 11:04:50 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-04-24 19:41:37 +0200
commit7f5b204f3b613bb7abfe18f6e47e92884cf2cd3b (patch)
treefc69d464c68714b9d9e0d35cfa5c2228b79f4f7b /ishtar_common/data_importer.py
parentee72a28880447513595663942a98dbfcfe61cc4a (diff)
downloadIshtar-7f5b204f3b613bb7abfe18f6e47e92884cf2cd3b.tar.bz2
Ishtar-7f5b204f3b613bb7abfe18f6e47e92884cf2cd3b.zip
Step by step import: fix JSON data update check
Diffstat (limited to 'ishtar_common/data_importer.py')
-rw-r--r--ishtar_common/data_importer.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index 4eb403c44..67aa402b8 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -1721,6 +1721,7 @@ class Importer(object):
else:
dct.pop(k)
+ obj = None
if self.simulate:
q = cls.objects.filter(**dct)
if not q.count():
@@ -1780,7 +1781,7 @@ class Importer(object):
new_val = dct['defaults'][k]
if new_val is None or new_val == '':
continue
- if k == 'data':
+ if obj and k == 'data':
updated_dct[k] = update_data(obj.data,
new_val)
else: