Mercurial > kallithea
changeset 2507:374693af2849 beta
API: update_user returns new updated user data
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 25 Jun 2012 23:20:27 +0200 |
| parents | 7e3e9d0c5575 |
| children | 43cb5b6047fd |
| files | docs/api/api.rst rhodecode/controllers/api/api.py |
| diffstat | 2 files changed, 25 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/api/api.rst Mon Jun 25 23:16:14 2012 +0200 +++ b/docs/api/api.rst Mon Jun 25 23:20:27 2012 +0200 @@ -273,7 +273,18 @@ result: { "id" : "<edited_user_id>", - "msg" : "updated user ID:<userid> <username>" + "msg" : "updated user ID:<userid> <username>", + "user": { + "id" : "<id>", + "username" : "<username>", + "firstname": "<firstname>", + "lastname" : "<lastname>", + "email" : "<email>", + "active" : "<bool>", + "admin" : "<bool>", + "ldap_dn" : "<ldap_dn>", + "last_login": "<last_login>", + }, } error: null
--- a/rhodecode/controllers/api/api.py Mon Jun 25 23:16:14 2012 +0200 +++ b/rhodecode/controllers/api/api.py Mon Jun 25 23:20:27 2012 +0200 @@ -202,14 +202,25 @@ raise JSONRPCError("user ID:%s does not exist" % userid) try: - usr = UserModel().create_or_update( + user = UserModel().create_or_update( username, password, email, firstname, lastname, active, admin, ldap_dn ) Session.commit() return dict( id=usr.user_id, - msg='updated user ID:%s %s' % (usr.user_id, usr.username) + msg='updated user ID:%s %s' % (user.user_id, user.username), + user=dict( + id=user.user_id, + username=user.username, + firstname=user.name, + lastname=user.lastname, + email=user.email, + active=user.active, + admin=user.admin, + ldap_dn=user.ldap_dn, + last_login=user.last_login, + ) ) except Exception: log.error(traceback.format_exc())