# HG changeset patch # User Thomas De Schampheleire # Date 2015-06-23 20:28:11 # Node ID b566aae19e21b50c52e293e31b2e2355897ffe31 # Parent fd00b28ac7d4b368ed67ca69450122f5e975b04d user: fall back to username in full_name_and_username if no name set diff --git a/kallithea/model/db.py b/kallithea/model/db.py --- a/kallithea/model/db.py +++ b/kallithea/model/db.py @@ -488,8 +488,10 @@ class User(Base, BaseModel): def full_name_and_username(self): """ Show full name and username as 'Firstname Lastname (username)'. + If full name is not set, fall back to username. """ - return '%s %s (%s)' % (self.firstname, self.lastname, self.username) + return ('%s %s (%s)' % (self.firstname, self.lastname, self.username) + if (self.firstname and self.lastname) else self.username) @property def full_contact(self):