Fix redirect in pull down menu for repository manager

galaxyproject · Oct 4, 2017 · d46d45a · d46d45a
1 parent 1115547
commit d46d45a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
@@ -88,7 +88,7 @@ def browse_repositories(self, trans, **kwd):
                 message, status = repository_util.check_for_updates(trans.app, trans.install_model, kwd.get('id'))
         if message and status:
             kwd['message'] = util.sanitize_text(message)
-            kwd['status'] = 'success' if status == 'ok' else 'danger'
+            kwd['status'] = 'success' if status in [ 'ok', 'done', 'success' ] else 'danger'
         kwd['dict_format'] = True
         return self.installed_repository_grid(trans, **kwd)
 

diff --git a/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py b/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py
@@ -158,7 +158,7 @@ def get_accepted_filters(self):
     ]
     operations = [grids.GridOperation(label="Update tool shed status",
                                       condition=(lambda item: not item.deleted),
-                                      allow_multiple=False)),
+                                      allow_multiple=False),
                   grids.GridOperation(label="Get updates",
                                       condition=(lambda item:
                                                  not item.deleted and

diff --git a/templates/admin/tool_shed_repository/repository_actions_menu.mako b/templates/admin/tool_shed_repository/repository_actions_menu.mako
@@ -20,7 +20,7 @@
                 <li><a class="action-button" target="galaxy_main" href="${h.url_for( controller='admin_toolshed', action='import_workflow', workflow_name=tool_shed_encode( workflow_name ), repository_id=trans.security.encode_id( repository.id ) )}">Import workflow to Galaxy</a></li>
             %endif
             %if repository.can_reinstall_or_activate:
-                <a class="action-button" href="${h.url_for( controller='admin_toolshed', action='browse_repositories', operation='activate or reinstall', id=trans.security.encode_id( repository.id ) )}">Activate or reinstall repository</a>
+                <a class="action-button" href="${h.url_for( controller='admin_toolshed', action='restore_repository', id=trans.security.encode_id( repository.id ) )}">Activate or reinstall repository</a>
             %endif
             %if in_error_state:
                 <a class="action-button" target="galaxy_main" href="${h.url_for( controller='admin_toolshed', action='reset_to_install', id=trans.security.encode_id( repository.id ), reset_repository=True )}">Reset to install</a>