diff options
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 |
commit | b349dad9eb19a745f6792328cad1e0d58e385373 (patch) | |
tree | 943104fdefe77a5fff6d0f7d8ca247bd22a76238 /ishtar_common/data_importer.py | |
parent | 145ea72a4e5b0bfae0ba14dcfdebdc58b51453e6 (diff) | |
download | Ishtar-b349dad9eb19a745f6792328cad1e0d58e385373.tar.bz2 Ishtar-b349dad9eb19a745f6792328cad1e0d58e385373.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.py | 6 |
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]() |