Mercurial > kallithea
diff rhodecode/controllers/api/__init__.py @ 3165:e1baadec6217 beta
fixes issue #702 API methods without arguments fail when "args":null
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Wed, 16 Jan 2013 00:20:45 +0100 |
parents | 28571535dd61 |
children | cd50d1b5f35b |
line wrap: on
line diff
--- a/rhodecode/controllers/api/__init__.py Tue Jan 15 11:39:31 2013 +0800 +++ b/rhodecode/controllers/api/__init__.py Wed Jan 16 00:20:45 2013 +0100 @@ -132,6 +132,9 @@ self._req_id = json_body['id'] self._req_method = json_body['method'] self._request_params = json_body['args'] + if not isinstance(self._request_params, dict): + self._request_params = {} + log.debug( 'method: %s, params: %s' % (self._req_method, self._request_params) @@ -212,6 +215,7 @@ ) self._rpc_args = {USER_SESSION_ATTR: u} + self._rpc_args.update(self._request_params) self._rpc_args['action'] = self._req_method