diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2012-12-31 16:52:16 +0100 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2012-12-31 16:52:16 +0100 |
| commit | 18f03745ba28120c720a13c1808240af2ee26865 (patch) | |
| tree | 68c1af1b6a4f3008400aad3a39940204bbf166f0 | |
| parent | d1a2718270cb54f779332f686344731c121b3725 (diff) | |
add ipaddresses to repo data on API calls
--HG--
branch : beta
| -rw-r--r-- | docs/api/api.rst | 42 | ||||
| -rwxr-xr-x | rhodecode/model/db.py | 6 |
2 files changed, 28 insertions, 20 deletions
diff --git a/docs/api/api.rst b/docs/api/api.rst index fc40d2b3..e15cb033 100644 --- 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 index 6030b468..c88ab391 100755 --- 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 |