summaryrefslogtreecommitdiff
path: root/ishtar_common/data_importer.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2020-11-03 13:23:35 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2021-02-28 12:15:21 +0100
commiteef264579c63ab657ef1da51895a0e207d7ba4e6 (patch)
tree943104fdefe77a5fff6d0f7d8ca247bd22a76238 /ishtar_common/data_importer.py
parentec1efecda48b3ed8888a00c94714573c0117b57c (diff)
downloadIshtar-eef264579c63ab657ef1da51895a0e207d7ba4e6.tar.bz2
Ishtar-eef264579c63ab657ef1da51895a0e207d7ba4e6.zip
Import match page: add edit type link - Fix default - Fix for document import
Diffstat (limited to 'ishtar_common/data_importer.py')
-rw-r--r--ishtar_common/data_importer.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index 46b581365..f48651ac7 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -1435,6 +1435,7 @@ class Importer(object):
m2ms = []
many_values = data.pop(attribute)
+ model = None
if hasattr(field_object, 'rel'):
model = field_object.rel.to
elif hasattr(field_object, 'related_model'):
@@ -1768,7 +1769,10 @@ class Importer(object):
post_save_keys = []
try:
try:
- dct = create_dict.copy()
+ dct = {}
+ if hasattr(cls, "get_import_defaults"):
+ dct = cls.get_import_defaults() or {}
+ dct.update(create_dict.copy())
for key in dct:
if callable(dct[key]):
dct[key] = dct[key]()