summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2024-04-09 15:42:14 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2024-04-16 16:43:03 +0200
commit741d64dcac64d43d540571db40753a353ff12ed5 (patch)
tree94be94d8e3b2cf115f7a9ec50d92cac9b3e5b4b6
parentf0a0a576b96d0242d47754f4a0f2bff528d1e05d (diff)
downloadIshtar-741d64dcac64d43d540571db40753a353ff12ed5.tar.bz2
Ishtar-741d64dcac64d43d540571db40753a353ff12ed5.zip
🐛 imports: fix post import actions in defaults
-rw-r--r--ishtar_common/data_importer.py2
-rw-r--r--ishtar_common/models_imports.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index b4be3d297..546d29b2d 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -1845,7 +1845,7 @@ class Importer(object):
if not path:
path = []
m2ms = []
- if type(data) != dict:
+ if not isinstance(data, dict):
# if data is not a dict we don't know what to do
return data, False
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index 4456cf974..ec5b39c65 100644
--- a/ishtar_common/models_imports.py
+++ b/ishtar_common/models_imports.py
@@ -658,7 +658,9 @@ class ImporterDefaultValues(models.Model):
return self.value
new_parent_model = field.remote_field.model
return self._get_value(new_parent_model, new_target)
- if target not in fields:
+ if hasattr(parent_model, target) and hasattr(getattr(parent_model, target), "importer_trigger"):
+ return self.value
+ elif target not in fields:
return
field = fields[target]
if target in ("srid", "txt_idx", "slug"):