Commit 482f1ea3 authored by Dannon Baker's avatar Dannon Baker
Browse files

Merge remote-tracking branch 'upstream/release_16.01' into release_16.04

parents dad5563c f3ba9e2b
...@@ -276,20 +276,6 @@ class RootController( controller.JSAppLauncher, UsesAnnotations ): ...@@ -276,20 +276,6 @@ class RootController( controller.JSAppLauncher, UsesAnnotations ):
else: else:
return "No data with id=%d" % id 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 ----------------------------------------------- # ---- History management -----------------------------------------------
@web.expose @web.expose
def history_delete( self, trans, id ): 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