summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2013-03-13 10:57:44 +0000
committerÉtienne Loks <etienne.loks@proxience.com>2013-03-13 10:57:44 +0000
commit56aea239caffef95c481aac3b77a8d43e8d3ca35 (patch)
tree03790fce85b142ac17b9350ac1a7eb6ccd5dae8c
parent3583bb854ddf6108fa725aa50d075db48652bf0e (diff)
parentfd4df93e212477cd7bdaa8286f8081138673608e (diff)
downloadIshtar-56aea239caffef95c481aac3b77a8d43e8d3ca35.tar.bz2
Ishtar-56aea239caffef95c481aac3b77a8d43e8d3ca35.zip
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
-rw-r--r--ishtar_common/models.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 6039f46e3..e5d966bf9 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -581,7 +581,9 @@ class Person(Address, OwnPerms) :
return lbl
def full_label(self):
- values = [unicode(_(self.title))]
+ values = []
+ if self.title:
+ values = [unicode(_(self.title))]
values += [unicode(getattr(self, attr))
for attr in ('surname', 'name', 'attached_to')
if getattr(self, attr)]