Remove unnecessary tool dependency installation status grid

lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py

@@ -45,7 +45,6 @@ class AdminToolshed(AdminGalaxy):
 
     installed_repository_grid = admin_toolshed_grids.InstalledRepositoryGrid()
     repository_installation_grid = admin_toolshed_grids.RepositoryInstallationGrid()
-    tool_dependency_grid = admin_toolshed_grids.ToolDependencyGrid()
 
     @web.expose
     @web.require_admin
@@ -792,7 +791,6 @@ class AdminToolshed(AdminGalaxy):
             # The user must be on the manage_repository_tool_dependencies page and clicked the button to either install or uninstall a
             # tool dependency, but they didn't check any of the available tool dependencies on which to perform the action.
             tool_shed_repository = repository_util.get_tool_shed_repository_by_id(trans.app, repository_id)
-        self.tool_dependency_grid.title = "Tool shed repository '%s' tool dependencies" % escape(tool_shed_repository.name)
         if 'operation' in kwd:
             operation = kwd['operation'].lower()
             if not tool_dependency_ids:
@@ -828,9 +826,6 @@ class AdminToolshed(AdminGalaxy):
                     message += ' and restart your Galaxy server to install tool dependencies.'
                     kwd['message'] = message
                     kwd['status'] = 'error'
-        # Redirect if no tool dependencies are in the process of being installed.
-        if tool_shed_repository.tool_dependencies_being_installed:
-            return self.tool_dependency_grid(trans, **kwd)
         return trans.response.send_redirect(web.url_for(controller='admin_toolshed',
                                                         action='manage_repository_tool_dependencies',
                                                         tool_dependency_ids=tool_dependency_ids,

lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py

@@ -352,76 +352,3 @@ class RepositoryInstallationGrid(grids.Grid):
         if tool_shed_repository_id:
             return query.filter_by(tool_shed_repository_id=trans.security.decode_id(tool_shed_repository_id))
         return query
-
-
-class ToolDependencyGrid(grids.Grid):
-
-    class NameColumn(grids.TextColumn):
-
-        def get_value(self, trans, grid, tool_dependency):
-            return tool_dependency.name
-
-    class VersionColumn(grids.TextColumn):
-
-        def get_value(self, trans, grid, tool_dependency):
-            return tool_dependency.version
-
-    class TypeColumn(grids.TextColumn):
-
-        def get_value(self, trans, grid, tool_dependency):
-            return tool_dependency.type
-
-    class StatusColumn(grids.TextColumn):
-
-        def get_value(self, trans, grid, tool_dependency):
-            if tool_dependency.status in [trans.install_model.ToolDependency.installation_status.INSTALLING]:
-                bgcolor = trans.install_model.ToolDependency.states.INSTALLING
-            elif tool_dependency.status in [trans.install_model.ToolDependency.installation_status.NEVER_INSTALLED,
-                                            trans.install_model.ToolDependency.installation_status.UNINSTALLED]:
-                bgcolor = trans.install_model.ToolDependency.states.UNINSTALLED
-            elif tool_dependency.status in [trans.install_model.ToolDependency.installation_status.ERROR]:
-                bgcolor = trans.install_model.ToolDependency.states.ERROR
-            elif tool_dependency.status in [trans.install_model.ToolDependency.installation_status.INSTALLED]:
-                bgcolor = trans.install_model.ToolDependency.states.OK
-            rval = '<div class="count-box state-color-%s" id="ToolDependencyStatus-%s">%s</div>' % \
-                (bgcolor, trans.security.encode_id(tool_dependency.id), tool_dependency.status)
-            return rval
-
-    title = "Tool Dependencies"
-    template = "admin/tool_shed_repository/tool_dependencies_grid.mako"
-    model_class = tool_shed_install.ToolDependency
-    default_sort_key = "-create_time"
-    num_rows_per_page = 50
-    preserve_state = True
-    use_paging = False
-    columns = [
-        NameColumn("Name",
-                   link=(lambda item: iff(item.status in [tool_shed_install.ToolDependency.installation_status.NEVER_INSTALLED,
-                                                          tool_shed_install.ToolDependency.installation_status.INSTALLING,
-                                                          tool_shed_install.ToolDependency.installation_status.UNINSTALLED],
-                                          None,
-                                          dict(action="manage_tool_dependencies", operation='browse', id=item.id))),
-                   filterable="advanced"),
-        VersionColumn("Version",
-                      filterable="advanced"),
-        TypeColumn("Type",
-                   filterable="advanced"),
-        StatusColumn("Installation Status",
-                     filterable="advanced"),
-    ]
-
-    def build_initial_query(self, trans, **kwd):
-        tool_dependency_ids = tool_dependency_util.get_tool_dependency_ids(as_string=False, **kwd)
-        if tool_dependency_ids:
-            clause_list = []
-            for tool_dependency_id in tool_dependency_ids:
-                clause_list.append(self.model_class.table.c.id == trans.security.decode_id(tool_dependency_id))
-            return trans.install_model.context.query(self.model_class) \
-                                              .filter(or_(*clause_list))
-        return trans.install_model.context.query(self.model_class)
-
-    def apply_query_filter(self, trans, query, **kwd):
-        tool_dependency_id = kwd.get('tool_dependency_id', None)
-        if tool_dependency_id:
-            return query.filter_by(tool_dependency_id=trans.security.decode_id(tool_dependency_id))
-        return query

templates/admin/tool_shed_repository/tool_dependencies_grid.mako

@@ -1,8 +0,0 @@
-<%inherit file="/grid_base.mako"/>
-<%namespace file="/admin/tool_shed_repository/common.mako" import="*" />
-
-<%def name="javascripts()">
-   ${parent.javascripts()}
-   ${dependency_status_updater()}
-   ${tool_dependency_installation_updater()}
-</%def>