From f8ba2e5371c8944c6a72808de963ef349f3ad115 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 17 Mar 2022 12:13:37 +0100 Subject: Geodata: adapt importer model --- ishtar_common/models_imports.py | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'ishtar_common/models_imports.py') diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 85b3473f9..b931cc4b4 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -120,7 +120,7 @@ class ImporterTypeManager(models.Manager): IMPORT_TYPES = ( - ("tab", "Table"), + ("tab", _("Table")), ("gis", _("GIS")), ) @@ -135,8 +135,21 @@ class ImporterType(models.Model): description = models.CharField( _("Description"), blank=True, null=True, max_length=500 ) - type = models.CharField(_("Type"), max_length=3, choices=IMPORT_TYPES, - default='tab') + type = models.CharField( + _("Type"), max_length=3, choices=IMPORT_TYPES, default="tab" + ) + layer_name = models.CharField( + _("Layer name"), + max_length=200, + blank=True, + null=True, + help_text=_("For GIS file with multiple layers"), + ) + is_main_geometry = models.BooleanField( + _("Set to main geometry"), + default=True, + help_text=_("Only relevant for GIS files"), + ) users = models.ManyToManyField("IshtarUser", verbose_name=_("Users"), blank=True) associated_models = models.ForeignKey( ImporterModel, @@ -464,7 +477,8 @@ class ImporterDefaultValues(models.Model): return field = fields[target] if not hasattr(field, "remote_field") or not hasattr( - field.remote_field, "model"): + field.remote_field, "model" + ): return self.value model = field.remote_field.model # if value is an id @@ -546,7 +560,7 @@ class ImporterColumn(models.Model): return ", ".join([dp.field_name or "" for dp in self.duplicate_fields.all()]) def formater_type_lbl(self): - return ', '.join([str(target.formater_type) for target in self.targets.all()]) + return ", ".join([str(target.formater_type) for target in self.targets.all()]) class ImporterDuplicateFieldManager(models.Manager): -- cgit v1.2.3