Merge branch 'release_15.03' into release_15.05

galaxyproject · Aug 19, 2015 · 483ea9e · 483ea9e
2 parents f01300d + 01278aa
commit 483ea9e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/galaxy/webapps/galaxy/api/tools.py b/lib/galaxy/webapps/galaxy/api/tools.py
@@ -107,14 +107,14 @@ def build( self, trans, id, **kwd ):
 
     @expose_api
     @web.require_admin
-    def reload( self, trans, tool_id, **kwd ):
+    def reload( self, trans, id, **kwd ):
         """
         GET /api/tools/{tool_id}/reload
         Reload specified tool.
         """
         toolbox = trans.app.toolbox
-        galaxy.queue_worker.send_control_task( trans, 'reload_tool', noop_self=True, kwargs={ 'tool_id': tool_id } )
-        message, status = trans.app.toolbox.reload_tool_by_id( tool_id )
+        galaxy.queue_worker.send_control_task( trans, 'reload_tool', noop_self=True, kwargs={ 'tool_id': id } )
+        message, status = trans.app.toolbox.reload_tool_by_id( id )
         return { status: message }
 
     @expose_api