Merge pull request #1637 from modoboa/fix/fullname_display

Display fullname when last_name is set too.
This commit is contained in:
Antoine Nguyen
2018-12-21 11:41:02 +01:00
committed by GitHub
+8 -3
View File
@@ -159,9 +159,14 @@ class User(AbstractUser):
@property
def fullname(self):
if self.first_name != u"":
return u"%s %s" % (self.first_name, self.last_name)
return self.username
result = self.username
if self.first_name != "":
result = self.first_name
if self.last_name != "":
if result != "":
result += " "
result += self.last_name
return result
@property
def identity(self):