You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2015/10/30 21:55:33 UTC
[14/50] [abbrv] allura git commit: [#7920] Fix routing conflict for
tools api endpoint
[#7920] Fix routing conflict for tools api endpoint
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/1104e290
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/1104e290
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/1104e290
Branch: refs/heads/db/7919
Commit: 1104e29045672ddf32445b4b321edb67ae0b2288
Parents: dfc3cac
Author: Heith Seewald <hs...@hsmb.local>
Authored: Tue Oct 6 12:24:55 2015 -0400
Committer: Heith Seewald <hs...@hsmb.local>
Committed: Thu Oct 29 20:21:32 2015 -0400
----------------------------------------------------------------------
Allura/allura/ext/admin/admin_main.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/1104e290/Allura/allura/ext/admin/admin_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index 83b0490..7b26815 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -796,14 +796,13 @@ class ProjectAdminRestController(BaseController):
return {'status': 'ok'}
@expose('json:')
- def tools(self, **kw):
+ def installable_tools(self, **kw):
""" List of installable tools
-
"""
response.content_type = 'application/json'
- tools_names = [t['name'] for t in AdminApp.installable_tools_for(c.project)]
+ tools = [t['name'] for t in AdminApp.installable_tools_for(c.project)]
- return {'status': 'ok'}
+ return {'tools': tools}
@expose('json:')
@require_post()