summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@viserion.(none)>2013-03-13 10:57:44 +0000
committerroot <root@viserion.(none)>2013-03-13 10:57:44 +0000
commit199f535e39880d6ddbbe6a068378fec7ff9fc084 (patch)
tree03790fce85b142ac17b9350ac1a7eb6ccd5dae8c
parent8fd4d136edaaa624cad59f6346f982aaab535f56 (diff)
parentbc002a96942499c89e9665dae0e51cc9e43a7117 (diff)
downloadIshtar-199f535e39880d6ddbbe6a068378fec7ff9fc084.tar.bz2
Ishtar-199f535e39880d6ddbbe6a068378fec7ff9fc084.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)]