diff --git a/docs/api/api.rst b/docs/api/api.rst --- a/docs/api/api.rst +++ b/docs/api/api.rst @@ -152,6 +152,7 @@ OUTPUT:: "firstname": "", "lastname" : "", "email" : "", + "emails": "", "active" : "", "admin" :  "", "ldap_dn" : "", diff --git a/rhodecode/controllers/api/api.py b/rhodecode/controllers/api/api.py --- a/rhodecode/controllers/api/api.py +++ b/rhodecode/controllers/api/api.py @@ -97,6 +97,7 @@ class ApiController(JSONRPCController): firstname=user.name, lastname=user.lastname, email=user.email, + emails=user.emails, active=user.active, admin=user.admin, ldap_dn=user.ldap_dn, diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -341,6 +341,11 @@ class User(Base, BaseModel): 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)