From 85da33dee639f5bc37189e3590063fcfe7029d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Tue, 16 May 2017 18:11:33 +0200
Subject: [PATCH] title property for all EditorFormMixin models

---
 src/c3nav/mapdata/models/base.py      |  4 ++++
 src/c3nav/mapdata/models/locations.py | 11 +++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/c3nav/mapdata/models/base.py b/src/c3nav/mapdata/models/base.py
index e857f1e4..e5ca14cd 100644
--- a/src/c3nav/mapdata/models/base.py
+++ b/src/c3nav/mapdata/models/base.py
@@ -34,3 +34,7 @@ class EditorFormMixin(SerializableMixin, models.Model):
 
     class Meta:
         abstract = True
+
+    @property
+    def title(self):
+        return self._meta.verbose_name+' '+str(self.id)
diff --git a/src/c3nav/mapdata/models/locations.py b/src/c3nav/mapdata/models/locations.py
index 8b5ec106..6db44f53 100644
--- a/src/c3nav/mapdata/models/locations.py
+++ b/src/c3nav/mapdata/models/locations.py
@@ -105,10 +105,13 @@ class Location(LocationSlug, EditorFormMixin, models.Model):
     @property
     def title(self):
         lang = get_language()
-        if lang in self.titles:
-            return self.titles[lang]
-        return (next(iter(self.titles.values())) if self.titles else
-                (self._meta.verbose_name+' '+(self.slug or str(self.id))))
+        if self.titles:
+            if lang in self.titles:
+                return self.titles[lang]
+            return next(iter(self.titles.values()))
+        if self.slug:
+            return self._meta.verbose_name + ' ' + self.slug
+        return super().title
 
     def get_color(self):
         if self.color: