Mercurial > kallithea
changeset 5246:fd00b28ac7d4
user: show 'Firstname Lastname (username)'
Additionally, clarify both full_name_or_username and full_name_and_username
with docstrings.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Tue, 30 Jun 2015 22:13:04 +0200 |
parents | 18fc1888455f |
children | b566aae19e21 |
files | kallithea/model/db.py |
diffstat | 1 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/model/db.py Tue Jun 23 20:23:13 2015 +0200 +++ b/kallithea/model/db.py Tue Jun 30 22:13:04 2015 +0200 @@ -477,12 +477,19 @@ @property def full_name_or_username(self): + """ + Show full name. + If full name is not set, fall back to username. + """ return ('%s %s' % (self.firstname, self.lastname) if (self.firstname and self.lastname) else self.username) @property def full_name_and_username(self): - return '%s (%s %s)' % (self.username, self.firstname, self.lastname) + """ + Show full name and username as 'Firstname Lastname (username)'. + """ + return '%s %s (%s)' % (self.firstname, self.lastname, self.username) @property def full_contact(self):