summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-11-06 18:38:30 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-11-06 18:38:30 +0100
commit9ab03b9fd3f0d9804d6d753d09e4358c6ea9d16a (patch)
tree98e6023a2562efb9d8da113d93940b76e7870483 /ishtar_common
parent305f2770421e165776b1ac1f92c69c474fbe918f (diff)
downloadIshtar-9ab03b9fd3f0d9804d6d753d09e4358c6ea9d16a.tar.bz2
Ishtar-9ab03b9fd3f0d9804d6d753d09e4358c6ea9d16a.zip
Fix import of new JSON fields (refs #4292)
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/data_importer.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index af8cc461e..5df845571 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -35,7 +35,7 @@ from django.db.models import Q
from django.template.defaultfilters import slugify
from django.utils.translation import ugettext_lazy as _
-from ishtar_common.utils import get_all_field_names
+from ishtar_common.utils import get_all_field_names, update_data
NEW_LINE_BREAK = '#####@@@#####'
@@ -1774,7 +1774,11 @@ class Importer(object):
new_val = dct['defaults'][k]
if new_val is None or new_val == '':
continue
- updated_dct[k] = new_val
+ if k == 'data':
+ updated_dct[k] = update_data(obj.data,
+ new_val)
+ else:
+ updated_dct[k] = new_val
if updated_dct:
if self.simulate:
self.updated_objects[-1][-1] = updated_dct