diff --git a/lib/galaxy/webapps/galaxy/controllers/history.py b/lib/galaxy/webapps/galaxy/controllers/history.py index 844945d285ff..e4746fb6cba0 100644 --- a/lib/galaxy/webapps/galaxy/controllers/history.py +++ b/lib/galaxy/webapps/galaxy/controllers/history.py @@ -47,33 +47,6 @@ def __init__(self, app: StructuredApp): def index(self, trans): return "" - @web.expose - def list_as_xml(self, trans): - """XML history list for functional tests""" - trans.response.set_content_type("text/xml") - return trans.fill_template("/history/list_as_xml.mako") - - @web.expose - def as_xml(self, trans, id=None, show_deleted=None, show_hidden=None): - """ - Return a history in xml format. - """ - if trans.app.config.require_login and not trans.user: - return trans.fill_template("/no_access.mako", message="Please log in to access Galaxy histories.") - - if id: - history = self.history_manager.get_accessible(self.decode_id(id), trans.user, current_history=trans.history) - else: - history = trans.get_history(most_recent=True, create=True) - - trans.response.set_content_type("text/xml") - return trans.fill_template_mako( - "history/as_xml.mako", - history=history, - show_deleted=string_as_bool(show_deleted), - show_hidden=string_as_bool(show_hidden), - ) - @expose_api_anonymous def view(self, trans, id=None, show_deleted=False, show_hidden=False, use_panels=True): """ @@ -231,21 +204,6 @@ def make_private(self, trans, history_id=None, all_histories=False, **kwd): "message": f"Success, requested permissions have been changed in {'all histories' if all_histories else history.name}." } - @web.expose - def adjust_hidden(self, trans, id=None, **kwd): - """THIS METHOD IS A TEMPORARY ADDITION. It'll allow us to fix the - regression in history-wide actions, and will be removed in the first - release after 17.01""" - action = kwd.get("user_action", None) - if action == "delete": - for hda in trans.history.datasets: - if not hda.visible: - hda.mark_deleted() - elif action == "unhide": - trans.history.unhide_datasets() - with transaction(trans.sa_session): - trans.sa_session.commit() - # ......................................................................... actions/orig. async @web.expose diff --git a/templates/webapps/galaxy/history/as_xml.mako b/templates/webapps/galaxy/history/as_xml.mako deleted file mode 100644 index 70446422945d..000000000000 --- a/templates/webapps/galaxy/history/as_xml.mako +++ /dev/null @@ -1,16 +0,0 @@ - - - %if show_deleted: - %for data in history.activatable_datasets: - - ${data.blurb} - - %endfor - %else: - %for data in history.active_datasets: - - ${data.blurb} - - %endfor - %endif - diff --git a/templates/webapps/galaxy/history/list_as_xml.mako b/templates/webapps/galaxy/history/list_as_xml.mako deleted file mode 100644 index 4b39dee47603..000000000000 --- a/templates/webapps/galaxy/history/list_as_xml.mako +++ /dev/null @@ -1,7 +0,0 @@ - - - %for i, history in enumerate( t.user.histories ): - - - %endfor -