diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/admin.py | 2 | ||||
| -rw-r--r-- | ishtar_common/data_importer.py | 5 | ||||
| -rw-r--r-- | ishtar_common/models.py | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index cc26d6253..7b1aa48d4 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -2129,7 +2129,7 @@ serialize_importer_group_action.short_description = SERIALIZE_DESC @admin.register(models.ImporterGroup, site=admin_site) -class ImporterTypeAdmin(admin.ModelAdmin): +class ImporterGroupAdmin(ImportJSONActionAdmin): list_display = ("name", "importer_types_label", "available") actions = [ serialize_importer_group_action, diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 7717c0e03..defea4da8 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -1315,6 +1315,9 @@ class Importer(object): if self.import_instance: self.import_instance.add_imported_line(self.idx_line) + if not obj: + return + if self.import_instance: if created: obj.imports.add(self.import_instance) @@ -2137,7 +2140,7 @@ class Importer(object): and type(new_val) == str ): updated_dct[k] = val + "\n" + new_val - else: + elif "defaults" in dct: for k in dct["defaults"]: new_val = dct["defaults"][k] if new_val is None or new_val == "": diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 9197a67bf..5b4620254 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1388,7 +1388,7 @@ class IshtarSiteProfile(models.Model, Cached): ) find_external_id = models.TextField( _("Find external id"), - default="{get_first_base_find__context_record__external_id}-{label}", + default="{{get_first_base_find__context_record__external_id}}-{{label}}{% if upstream_count %}-{{upstream_count}}{% endif %}", help_text=_( "Formula to manage find external ID. " "Change this with care. With incorrect formula, the " |