Replace remaining redirects from makos in iframes with error messages

galaxyproject · Oct 16, 2017 · 145a7bd · 145a7bd
1 parent 3811278
commit 145a7bd
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
@@ -920,11 +920,7 @@ def prepare_for_install(self, trans, **kwd):
                     message += 'include newly defined repository or tool dependency definitions, and attempting '
                     message += 'to update the repository resulted in the following error.  Contact the Tool Shed '
                     message += 'administrator if necessary.<br/>%s' % str(e)
-                    status = 'error'
-                    return trans.response.send_redirect(web.url_for(controller='admin',
-                                                                    action='repositories',
-                                                                    message=message,
-                                                                    status=status))
+                    return trans.show_error_message(message)
                 changeset_revisions = updating_to_changeset_revision
             else:
                 changeset_revisions = kwd.get('changeset_revisions', None)
@@ -1166,9 +1162,7 @@ def purge_repository(self, trans, **kwd):
         else:
             new_kwd['status'] = 'error'
             new_kwd['message'] = 'Invalid repository id value "None" received for repository to be purged.'
-        return trans.response.send_redirect(web.url_for(controller='admin',
-                                                        action='repositories',
-                                                        **new_kwd))
+        return trans.show_error_message(new_kwd['message'])
 
     @web.expose
     @web.require_admin
@@ -1332,11 +1326,7 @@ def repair_repository(self, trans, **kwd):
         repository_id = kwd.get('id', None)
         if not repository_id:
             message = 'Invalid installed tool shed repository id %s received.' % str(repository_id)
-            status = 'error'
-            return trans.response.send_redirect(web.url_for(controller='admin',
-                                                            action='repositories',
-                                                            message=message,
-                                                            status=status))
+            return trans.show_error_message(message)
         tool_shed_repository = repository_util.get_installed_tool_shed_repository(trans.app, repository_id)
         rrm = RepairRepositoryManager(trans.app)
         if kwd.get('repair_repository_button', False):