Mercurial > kallithea
diff rhodecode/controllers/api/__init__.py @ 2151:12ceeda33339 beta
#404 API extensions for showing permission for users
- added permissions to get_user function
- added last_login to get_user and get_users function
- modified custom JSON encoder to handle non standard python types, like set, OrderedDict, datetime, date
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 21 Mar 2012 21:00:55 +0200 |
| parents | a76e9bacbedc |
| children | dc2584ba5fbc 7ac09514a178 |
line wrap: on
line diff
--- a/rhodecode/controllers/api/__init__.py Wed Mar 21 19:19:22 2012 +0200 +++ b/rhodecode/controllers/api/__init__.py Wed Mar 21 21:00:55 2012 +0200 @@ -233,10 +233,10 @@ try: return json.dumps(response) except TypeError, e: - log.debug('Error encoding response: %s' % e) + log.error('API FAILED. Error encoding response: %s' % e) return json.dumps( dict( - self._req_id, + id=self._req_id, result=None, error="Error encoding response" )