From 55fda6c9bd1cd304137e38e195e641f6b29116ce Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 30 Apr 2013 16:26:37 +0200 Subject: Add extra fields to Operation (fr specific) - many display improvment --- ishtar_common/models.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'ishtar_common/models.py') 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 = [] -- cgit v1.2.3