summaryrefslogtreecommitdiff
path: root/ishtar_common/models.py
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/models.py')
-rw-r--r--ishtar_common/models.py15
1 files changed, 15 insertions, 0 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index f6eeab72f..21216163a 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -3751,6 +3751,14 @@ class Town(Imported, models.Model):
self.save()
return self.cached_label
+ @property
+ def label_with_areas(self):
+ label = [self.name]
+ for area in self.areas.all():
+ label.append(u" - ")
+ label.append(area.full_label)
+ return u" ".join(label)
+
def generate_geo(self, force=False):
force = self.generate_limit(force=force)
self.generate_center(force=force)
@@ -3862,6 +3870,13 @@ class Area(HierarchicalType):
return self.label
return u"{} ({})".format(self.label, self.reference)
+ @property
+ def full_label(self):
+ label = [unicode(self)]
+ if self.parent:
+ label.append(self.parent.full_label)
+ return u" / ".join(label)
+
class OperationType(GeneralType):
order = models.IntegerField(_(u"Order"), default=1)