[31/46] allura git commit: [#7920] Fix routing conflict for tools api endpoint

[br...@apache.org]

[#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/0d8b3550
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/0d8b3550
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/0d8b3550

Branch: refs/heads/db/7919
Commit: 0d8b355005bd37f051d2a19247233bfe3157febc
Parents: 675dfc6
Author: Heith Seewald <hs...@hsmb.local>
Authored: Tue Oct 6 12:24:55 2015 -0400
Committer: Heith Seewald <hs...@hsmb.local>
Committed: Thu Oct 15 15:00:18 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/0d8b3550/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 676a6fc..c10926a 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()