From f4e80537d1e4652c2b62f92272d08445be27eb67 Mon Sep 17 00:00:00 2001
From: Sergey Golitsynskiy <sgolitsynskiy@gmail.com>
Date: Fri, 14 Aug 2020 22:36:18 -0400
Subject: [PATCH 1/2] Fix incorrect link

---
 lib/galaxy/webapps/galaxy/controllers/history.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/galaxy/webapps/galaxy/controllers/history.py b/lib/galaxy/webapps/galaxy/controllers/history.py
index 0a2b5bc18b3..38bb065eef6 100644
--- a/lib/galaxy/webapps/galaxy/controllers/history.py
+++ b/lib/galaxy/webapps/galaxy/controllers/history.py
@@ -1130,9 +1130,9 @@ class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesIt
                                           % ({'n': history.name, 's': url_for(controller='history', action="export_archive", id=id, qualified=True)}))
         self.queue_history_export(trans, history, gzip=gzip, include_hidden=include_hidden, include_deleted=include_deleted)
         url = url_for(controller='history', action="export_archive", id=id, qualified=True)
-        return trans.show_message("Exporting History '%(n)s'. You will need to <a href='%(share)s'>make this history 'accessible'</a> in order to import this to another galaxy sever. <br/>"
+        return trans.show_message("Exporting History '%(n)s'. You will need to <a href='%(share)s' target='_top'>make this history 'accessible'</a> in order to import this to another galaxy sever. <br/>"
                                   "Use this link to download the archive or import it to another Galaxy server: "
-                                  "<a href='%(u)s'>%(u)s</a>" % ({'share': url_for(controller='history', action='sharing'), 'n': history.name, 'u': url}))
+                                  "<a href='%(u)s'>%(u)s</a>" % ({'share': url_for(controller='', action='histories/sharing', id=id), 'n': history.name, 'u': url}))
         # TODO: used in this file and index.mako
 
     @web.expose

From f6c85d32d1098b56bb4acf69fc5404664e262eb6 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Fri, 21 Aug 2020 12:40:44 -0400
Subject: [PATCH 2/2] Don't use controller/action for client route

---
 lib/galaxy/webapps/galaxy/controllers/history.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/galaxy/webapps/galaxy/controllers/history.py b/lib/galaxy/webapps/galaxy/controllers/history.py
index 38bb065eef6..cdd11c847e1 100644
--- a/lib/galaxy/webapps/galaxy/controllers/history.py
+++ b/lib/galaxy/webapps/galaxy/controllers/history.py
@@ -1132,7 +1132,7 @@ class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesIt
         url = url_for(controller='history', action="export_archive", id=id, qualified=True)
         return trans.show_message("Exporting History '%(n)s'. You will need to <a href='%(share)s' target='_top'>make this history 'accessible'</a> in order to import this to another galaxy sever. <br/>"
                                   "Use this link to download the archive or import it to another Galaxy server: "
-                                  "<a href='%(u)s'>%(u)s</a>" % ({'share': url_for(controller='', action='histories/sharing', id=id), 'n': history.name, 'u': url}))
+                                  "<a href='%(u)s'>%(u)s</a>" % ({'share': url_for('/histories/sharing', id=id), 'n': history.name, 'u': url}))
         # TODO: used in this file and index.mako
 
     @web.expose