diff options
| author | root <root@viserion.(none)> | 2013-04-30 15:27:34 +0000 |
|---|---|---|
| committer | root <root@viserion.(none)> | 2013-04-30 15:27:34 +0000 |
| commit | 03f21b1abbae8962c81f46c01f1bb972fc7b2395 (patch) | |
| tree | 5f5652a1fb2027bbf4dd1dc26d6e28cbc04ea8fb /ishtar_common/models.py | |
| parent | 16e1f93de47184e52765f950e39cb04f6ed93dd8 (diff) | |
| parent | eadca6ca09b823da4596b7b904420e6314383b50 (diff) | |
| download | Ishtar-03f21b1abbae8962c81f46c01f1bb972fc7b2395.tar.bz2 Ishtar-03f21b1abbae8962c81f46c01f1bb972fc7b2395.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 61c7de7ff..8fcfacc9a 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -578,12 +578,10 @@ class Person(Address, OwnPerms) : ) def __unicode__(self): - lbl = u"%s %s" % (self.name, self.surname) - if self.attached_to: - lbl += settings.JOINT + unicode(self.attached_to) - elif self.email: - lbl += settings.JOINT + self.email - return lbl + values = [unicode(getattr(self, attr)) + for attr in ('surname', 'name', 'attached_to') + if getattr(self, attr)] + return u" ".join(values) def full_label(self): values = [] |