# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2015-06-30 22:13:04
# Node ID fd00b28ac7d4b368ed67ca69450122f5e975b04d
# Parent  18fc1888455f43a9b1a4f289c1769285ca946d68

user: show 'Firstname Lastname (username)'

Additionally, clarify both full_name_or_username and full_name_and_username
with docstrings.

diff --git a/kallithea/model/db.py b/kallithea/model/db.py
--- a/kallithea/model/db.py
+++ b/kallithea/model/db.py
@@ -477,12 +477,19 @@ class User(Base, BaseModel):
 
     @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):