summaryrefslogtreecommitdiff
path: root/ishtar_common/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-03-21 17:55:48 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-03-27 17:53:27 +0200
commit951b9e9ba349459f5b1abbdd092d5910c346cd9f (patch)
treefddb75df476ad2322feaf0395d25822d8bf25390 /ishtar_common/views.py
parent54daa385a241ad272abe9e06a63a0da36ff17749 (diff)
downloadIshtar-951b9e9ba349459f5b1abbdd092d5910c346cd9f.tar.bz2
Ishtar-951b9e9ba349459f5b1abbdd092d5910c346cd9f.zip
Step by step import: present object to be created, updated, etc. (refs #3975)
Diffstat (limited to 'ishtar_common/views.py')
-rw-r--r--ishtar_common/views.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 1af2f58ae..a45a9f87c 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -1897,7 +1897,7 @@ class ImportStepByStepView(IshtarMixin, LoginRequiredMixin, TemplateView):
field_name = formater.export_field_name[0]
value = self.new_data[0].copy()
for key in field_name.split('__'):
- if key in value:
+ if value and key in value:
value = value[key]
else:
value = u"-"
@@ -1910,6 +1910,10 @@ class ImportStepByStepView(IshtarMixin, LoginRequiredMixin, TemplateView):
range(1, len(headers) + 1), headers, self.imprt.current_csv_line,
interpreted_values
)
+ dct['new_objects'] = self.imprt.new_objects
+ dct['updated_objects'] = self.imprt.updated_objects
+ dct['ambiguous_objects'] = self.imprt.ambiguous_objects
+ dct['not_find_objects'] = self.imprt.not_find_objects
return dct