diff options
| -rw-r--r-- | ishtar_common/data_importer.py | 2 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 4 |
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"): |