diff --git a/loko/assets/models/its.py b/loko/assets/models/its.py index 83a8438..ab9abaa 100644 --- a/loko/assets/models/its.py +++ b/loko/assets/models/its.py @@ -158,6 +158,10 @@ class ITSBollardSystem(AbstractGeoAsset): def plots_count(self): return self.plots.count() + @property + def name(self): + return self.get_name() + BOLLARD_TYPE_CHOICES = ( ('automatic', _('Automatique / Escamotable')), @@ -178,6 +182,10 @@ class ITSBollardPlot(AbstractGeoAsset): location = models.ForeignKey(ITSLocation, related_name="bollard_plots", on_delete=models.SET_NULL, null=True, blank=True, verbose_name=_("Localisation ITS")) extra_data = models.JSONField(default=dict, blank=True, verbose_name=_("Métadonnées techniques")) + @property + def name(self): + return self.get_name() + def clean(self): super().clean() if not self.location_id and self.system and self.system.location_id: diff --git a/loko/assets/views/its.py b/loko/assets/views/its.py index 55a454d..6d6ca3e 100644 --- a/loko/assets/views/its.py +++ b/loko/assets/views/its.py @@ -354,7 +354,7 @@ def its_assets_geojson(request): props["bollard_type"] = obj.get_bollard_type_display() if hasattr(obj, 'get_bollard_type_display') else obj.bollard_type if getattr(obj, 'system', None): props["system_code"] = obj.system.code - props["system_name"] = obj.system.name + props["system_name"] = obj.system.get_name() if hasattr(obj.system, 'get_name') else (obj.system.name_fr or obj.system.name_nl or obj.system.code) return { "type": "Feature", "id": obj.id,