From 1482be99ce249d01c8836b7f75b3a696974e8d2f Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 25 Jul 2020 20:26:21 +0200 Subject: Admin: Import/export as JSON for types and importers --- ishtar_common/models_imports.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ishtar_common/models_imports.py') diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 7fdee8ce3..4fa1abb4a 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -103,11 +103,11 @@ class ImporterType(models.Model): associated_models = models.ForeignKey( ImporterModel, verbose_name=_("Associated model"), on_delete=models.SET_NULL, - related_name='+', blank=True, null=True) + related_name='importer_type_associated', blank=True, null=True) created_models = models.ManyToManyField( ImporterModel, verbose_name=_("Models that can accept new items"), blank=True, help_text=_("Leave blank for no restrictions"), - related_name='+') + related_name='importer_type_created') is_template = models.BooleanField(_("Can be exported"), default=False) unicity_keys = models.CharField(_("Unicity keys (separator \";\")"), blank=True, null=True, max_length=500) @@ -415,9 +415,11 @@ class ImporterColumn(models.Model): description = models.TextField(_("Description"), blank=True, null=True) regexp_pre_filter = models.ForeignKey( "Regexp", blank=True, null=True, on_delete=models.SET_NULL, + related_name="columns", ) value_format = models.ForeignKey( "ValueFormater", blank=True, null=True, on_delete=models.SET_NULL, + related_name="columns" ) required = models.BooleanField(_("Required"), default=False) export_field_name = models.CharField( @@ -552,7 +554,7 @@ class ImportTarget(models.Model): """ column = models.ForeignKey(ImporterColumn, related_name='targets') target = models.CharField("Target", max_length=500) - formater_type = models.ForeignKey("FormaterType") + formater_type = models.ForeignKey("FormaterType", related_name='targets') force_new = models.BooleanField(_("Force creation of new items"), default=False) concat = models.BooleanField(_("Concatenate with existing"), -- cgit v1.2.3