summaryrefslogtreecommitdiff
path: root/ishtar_common/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-04-19 11:44:30 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-06-12 08:41:54 +0200
commit07f25cfbccd59d8c6b57b3487b2083cfa03cceae (patch)
tree7e62f1a40e85bbbee3c8ec209dcb3a0dd4c898e5 /ishtar_common/models.py
parent68f0b07848478b525898b73e0788f92bb6670210 (diff)
downloadIshtar-07f25cfbccd59d8c6b57b3487b2083cfa03cceae.tar.bz2
Ishtar-07f25cfbccd59d8c6b57b3487b2083cfa03cceae.zip
Account wizard: edit areas (refs #4060)
Diffstat (limited to 'ishtar_common/models.py')
-rw-r--r--ishtar_common/models.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index ca4055fb2..67c4422f6 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -2686,7 +2686,15 @@ class UserProfile(models.Model):
verbose_name_plural = _(u"User profiles")
def __unicode__(self):
- return unicode(self.profile_type)
+ lbl = unicode(self.profile_type)
+ if not self.areas.count():
+ return lbl
+ return u"{} ({})".format(lbl, u", ".join(
+ [unicode(area) for area in self.areas.all()]))
+
+ @property
+ def area_labels(self):
+ return u", ".join([unicode(area) for area in self.areas.all()])
class IshtarUser(FullSearch):