From 30668fe5344192e7b17f05060062fa330c5496a0 Mon Sep 17 00:00:00 2001
From: Daniel Blankenberg <dan.blankenberg@gmail.com>
Date: Tue, 10 Nov 2015 11:58:17 -0500
Subject: [PATCH] Fix for reloading tools that have non-standard
 tool_ids/versions.

---
 lib/galaxy/web/base/controllers/admin.py | 2 +-
 templates/admin/reload_tool.mako         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/galaxy/web/base/controllers/admin.py b/lib/galaxy/web/base/controllers/admin.py
index 37821a3415c..b4e4fc29331 100644
--- a/lib/galaxy/web/base/controllers/admin.py
+++ b/lib/galaxy/web/base/controllers/admin.py
@@ -98,7 +98,7 @@ class Admin( object ):
         toolbox = self.app.toolbox
         tool_id = None
         if params.get( 'reload_tool_button', False ):
-            tool_id = params.get('tool_id', None)
+            tool_id = kwd.get( 'tool_id', None )
             galaxy.queue_worker.send_control_task(trans.app, 'reload_tool', noop_self=True, kwargs={'tool_id': tool_id} )
             message, status = trans.app.toolbox.reload_tool_by_id( tool_id)
         return trans.fill_template( '/admin/reload_tool.mako',
diff --git a/templates/admin/reload_tool.mako b/templates/admin/reload_tool.mako
index 15d22ff38f2..c29a233e2e5 100644
--- a/templates/admin/reload_tool.mako
+++ b/templates/admin/reload_tool.mako
@@ -31,7 +31,7 @@ $().ready(function() {
             <select name="tool_id">
                 %for val in toolbox.tool_panel_contents( trans ):
                     %if isinstance( val, Tool ):
-                        <option value="${val.id}">${val.name|h}</option>
+                        <option value="${val.id|h}">${val.name|h}</option>
                     %elif isinstance( val, ToolSection ):
                         <optgroup label="${val.name|h}">
                         <% section = val %>
@@ -41,7 +41,7 @@ $().ready(function() {
                                 %if section_val.id == tool_id:
                                      <% selected_str = " selected=\"selected\"" %>
                                 %endif
-                                <option value="${section_val.id}"${selected_str}>${section_val.name|h}</option>
+                                <option value="${section_val.id|h}"${selected_str}>${section_val.name|h}</option>
                             %endif
                         %endfor
                     %endif