Display uninstall form in center panel, remove redirect

galaxyproject · Oct 16, 2017 · 6c7efc2 · 6c7efc2
1 parent 857af99
commit 6c7efc2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
@@ -237,11 +237,6 @@ def deactivate_or_uninstall_repository(self, trans, **kwd):
                         message += 'Attempting to uninstall tool dependencies resulted in errors: %s' % errors
                         status = max(status, statuses.index('error'))
         status = statuses[status]
-        if kwd.get('deactivate_or_uninstall_repository_button', False):
-            return trans.response.send_redirect(web.url_for(controller='admin',
-                                                            action='repositories',
-                                                            message=message,
-                                                            status=status))
         remove_from_disk_check_box = CheckboxField('remove_from_disk', checked=remove_from_disk_checked)
         return trans.fill_template('/admin/tool_shed_repository/deactivate_or_uninstall_repository.mako',
                                    repository=tool_shed_repositories,

diff --git a/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py b/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py
@@ -189,6 +189,7 @@ def get_accepted_filters(self):
                                                  not item.deleted and
                                                  item.status != tool_shed_install.ToolShedRepository.installation_status.NEW),
                                       allow_multiple=True,
+                                      target="center",
                                       url_args=dict(controller='admin_toolshed',
                                                     action='deactivate_or_uninstall_repository')),
                   grids.GridOperation(label="Reset to install",