Skip to content
GitLab
Commit ac46d21e authored by Dannon Baker's avatar Dannon Baker
Browse files

Merge remote-tracking branch 'upstream/release_17.09' into release_18.01

parents 71b56151 40cecf6f
Hide whitespace changes
Inline Side-by-side
lib/galaxy/webapps/galaxy/controllers/root.py
View file @ ac46d21e
......@@ -252,20 +252,6 @@ class RootController(controller.JSAppLauncher, UsesAnnotations):
else:
return "No data with id=%d" % id
@web.expose
def peek(self, trans, id=None):
"""Returns a 'peek' at the data.
"""
# TODO: unused?
# TODO: unencoded id
data = trans.sa_session.query(self.app.model.HistoryDatasetAssociation).get(id)
if data:
yield "<html><body><pre>"
yield data.peek
yield "</pre></body></html>"
else:
yield "No data with id=%d" % id
# ---- History management -----------------------------------------------
@web.expose
def history_delete(self, trans, id):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment