# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2012-12-31 16:52:16
# Node ID 71ce052f8b6b0fa0b886d9136b9986b8b061af2c
# Parent  703070153bc18455f03c3bcecbc91934af609639

add ipaddresses to repo data on API calls

diff --git a/docs/api/api.rst b/docs/api/api.rst
--- a/docs/api/api.rst
+++ b/docs/api/api.rst
@@ -233,16 +233,17 @@ OUTPUT::
     id : <id_given_in_input>
     result: None if user does not exist or 
             {
-                "user_id" :  "<user_id>",
-                "username" : "<username>",
-                "firstname": "<firstname>",
-                "lastname" : "<lastname>",
-                "email" :    "<email>",
-                "emails":    "<list_of_all_additional_emails>",
-                "active" :   "<bool>",
-                "admin" :    "<bool>",
-                "ldap_dn" :  "<ldap_dn>",
-                "last_login": "<last_login>",
+                "user_id" :     "<user_id>",
+                "username" :    "<username>",
+                "firstname":    "<firstname>",
+                "lastname" :    "<lastname>",
+                "email" :       "<email>",
+                "emails":       "<list_of_all_additional_emails>",
+                "ip_addresses": "<list_of_ip_addresses_for_user>",
+                "active" :      "<bool>",
+                "admin" :       "<bool>",
+                "ldap_dn" :     "<ldap_dn>",
+                "last_login":   "<last_login>",
                 "permissions": {
                     "global": ["hg.create.repository",
                                "repository.read",
@@ -274,16 +275,17 @@ OUTPUT::
     id : <id_given_in_input>
     result: [
               {
-                "user_id" :  "<user_id>",
-                "username" : "<username>",
-                "firstname": "<firstname>",
-                "lastname" : "<lastname>",
-                "email" :    "<email>",
-                "emails":    "<list_of_all_additional_emails>",
-                "active" :   "<bool>",
-                "admin" :    "<bool>",
-                "ldap_dn" :  "<ldap_dn>",
-                "last_login": "<last_login>",
+                "user_id" :     "<user_id>",
+                "username" :    "<username>",
+                "firstname":    "<firstname>",
+                "lastname" :    "<lastname>",
+                "email" :       "<email>",
+                "emails":       "<list_of_all_additional_emails>",
+                "ip_addresses": "<list_of_ip_addresses_for_user>",
+                "active" :      "<bool>",
+                "admin" :       "<bool>",
+                "ldap_dn" :     "<ldap_dn>",
+                "last_login":   "<last_login>",
               },
     	      …
             ]
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -370,6 +370,11 @@ class User(Base, BaseModel):
         return [self.email] + [x.email for x in other]
 
     @property
+    def ip_addresses(self):
+        ret = UserIpMap.query().filter(UserIpMap.user == self).all()
+        return [x.ip_addr for x in ret]
+
+    @property
     def username_and_name(self):
         return '%s (%s %s)' % (self.username, self.firstname, self.lastname)
 
@@ -472,6 +477,7 @@ class User(Base, BaseModel):
             admin=user.admin,
             ldap_dn=user.ldap_dn,
             last_login=user.last_login,
+            ip_addresses=user.ip_addresses
         )
         return data