From f0b5caff5fed1e125e80e07b7f2b43bc4d98f5e7 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Thu, 19 Oct 2017 11:51:22 -0400
Subject: [PATCH] Fix variable testing

---
 lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py     | 4 +++-
 .../monitor_repository_installation.mako                    | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
index 9413f3ff8e6..8ba10b73eea 100644
--- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
+++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
@@ -796,7 +796,9 @@ class AdminToolshed(AdminGalaxy):
         query = trans.install_model.context.current.query(trans.install_model.ToolShedRepository).filter(or_(*clause_list))
         return trans.fill_template('admin/tool_shed_repository/monitor_repository_installation.mako',
                                         tool_shed_repositories=tool_shed_repositories,
-                                        query=query)
+                                        query=query,
+                                        message=kwd.get('message'),
+                                        status=kwd.get('status'))
 
     @web.json
     @web.require_admin
diff --git a/templates/admin/tool_shed_repository/monitor_repository_installation.mako b/templates/admin/tool_shed_repository/monitor_repository_installation.mako
index 2da9e1e8c76..8bad0ba2425 100644
--- a/templates/admin/tool_shed_repository/monitor_repository_installation.mako
+++ b/templates/admin/tool_shed_repository/monitor_repository_installation.mako
@@ -11,7 +11,7 @@
 
 <%def name="repository_installation_javascripts()">
     <script type="text/javascript">
-        %if hasattr(self, "initiate_repository_installation_ids"):
+        %if context.get("initiate_repository_installation_ids"):
             $(document).ready(function( ){
                 initiate_repository_installation( "${initiate_repository_installation_ids}", "${encoded_kwd}", "${reinstalling}" );
             });
@@ -31,8 +31,8 @@
     </script>
 </%def>
 
-%if hasattr(self, "message"):
-    ${render_msg( message, error )}
+%if context.get("message"):
+    ${render_msg( message, status )}
 %endif
 
 %if tool_shed_repositories: