summaryrefslogtreecommitdiff
path: root/ishtar_common/models_common.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2024-06-25 18:58:44 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2024-06-25 18:58:44 +0200
commitf4eceb80557e2141e8535cc1b555c1a72e3e8ddd (patch)
tree59a1b1990f17f8c39dbd60462a54dd158020ffea /ishtar_common/models_common.py
parent1d416a4bb927fb501c452b2c7c4b1f3e9c3c8e0c (diff)
downloadIshtar-f4eceb80557e2141e8535cc1b555c1a72e3e8ddd.tar.bz2
Ishtar-f4eceb80557e2141e8535cc1b555c1a72e3e8ddd.zip
✨ Notices - Town: add old town, new town reference on notices (refs #5380, #5732)
Diffstat (limited to 'ishtar_common/models_common.py')
-rw-r--r--ishtar_common/models_common.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index ae4b5a64b..adc6ca9eb 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -3483,7 +3483,17 @@ class Town(GeographicItem, Imported, DocumentItem, MainItem, models.Model):
for area in self.areas.all():
label.append(" - ")
label.append(area.full_label)
- return " ".join(label)
+ label = " ".join(label)
+ if self.children.count():
+ label += str(_(", old town of ")) + " ; ".join([
+ "{label} ({code})".format(label=p.name, code=p.numero_insee)
+ if p.numero_insee else p.name for p in self.children.all()
+ ])
+ return label
+
+ @property
+ def detail_label(self):
+ return self.label_with_areas
def generate_geo(self, force=False):
force = self.generate_limit(force=force)