# HG changeset patch # User Marcin Kuzminski # Date 1340658974 -7200 # Node ID 7e3e9d0c55758df5f1edfc1f0d1dfd082d9d8aa8 # Parent 02fc6ce0cd44a85cf9fdd9abe3ea160c90a373f7 Add list of all emails that user may have into get_user call diff -r 02fc6ce0cd44 -r 7e3e9d0c5575 docs/api/api.rst --- a/docs/api/api.rst Mon Jun 25 23:08:06 2012 +0200 +++ b/docs/api/api.rst Mon Jun 25 23:16:14 2012 +0200 @@ -152,6 +152,7 @@ "firstname": "", "lastname" : "", "email" : "", + "emails": "", "active" : "", "admin" :  "", "ldap_dn" : "", diff -r 02fc6ce0cd44 -r 7e3e9d0c5575 rhodecode/controllers/api/api.py --- a/rhodecode/controllers/api/api.py Mon Jun 25 23:08:06 2012 +0200 +++ b/rhodecode/controllers/api/api.py Mon Jun 25 23:16:14 2012 +0200 @@ -97,6 +97,7 @@ firstname=user.name, lastname=user.lastname, email=user.email, + emails=user.emails, active=user.active, admin=user.admin, ldap_dn=user.ldap_dn, diff -r 02fc6ce0cd44 -r 7e3e9d0c5575 rhodecode/model/db.py --- a/rhodecode/model/db.py Mon Jun 25 23:08:06 2012 +0200 +++ b/rhodecode/model/db.py Mon Jun 25 23:16:14 2012 +0200 @@ -341,6 +341,11 @@ self._email = val.lower() if val else None @property + def emails(self): + other = UserEmailMap.query().filter(UserEmailMap.user==self).all() + return [self.email] + [x.email for x in other] + + @property def full_name(self): return '%s %s' % (self.name, self.lastname)