engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

api: add backward compatible info required for rhodecode-index.

Browse source
This commit is contained in:
Marcin Kuzminski 2016-11-25 19:47:36 +01:00
parent 0d77b2d964
commit e2e4b830d8
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rhodecode/api/tests/test_get_server_info.py
View file

@ -67,3 +67,12 @@ class TestGetServerInfo(object):
expected['server'] = resp['result']['server']
assert_ok(id_, expected, given=response.body)
def test_api_get_server_info_data_for_search_index_build(self):
id_, params = build_data(self.apikey, 'get_server_info')
response = api_call(self.app, params)
resp = response.json
# required by indexer
assert resp['result']['index_storage']
assert resp['result']['storage']

8
rhodecode/api/views/server_api.py
View file

@ -60,7 +60,13 @@ def get_server_info(request, apiuser):
if not has_superadmin_permission(apiuser):
raise JSONRPCForbidden()
return ScmModel().get_server_info(request.environ)
server_info = ScmModel().get_server_info(request.environ)
# rhodecode-index requires those
server_info['index_storage'] = server_info['search']['value']['location']
server_info['storage'] = server_info['storage']['value']['path']
return server_info
@jsonrpc_method()