details: http://www.bx.psu.edu/hg/galaxy/rev/c2a80b197ba5 changeset: 3700:c2a80b197ba5 user: jeremy goecks <jeremy.goecks@emory.edu> date: Tue Apr 27 10:12:59 2010 -0400 description: Encode HDA id for edit link in history panel. diffstat: lib/galaxy/web/controllers/root.py | 3 ++- templates/root/history_common.mako | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diffs (25 lines): diff -r ba5b796311f3 -r c2a80b197ba5 lib/galaxy/web/controllers/root.py --- a/lib/galaxy/web/controllers/root.py Tue Apr 27 09:32:38 2010 -0400 +++ b/lib/galaxy/web/controllers/root.py Tue Apr 27 10:12:59 2010 -0400 @@ -253,7 +253,8 @@ history = trans.get_history() # TODO: hid handling data = history.datasets[ int( hid ) - 1 ] - elif id is not None: + elif id is not None: + id = trans.security.decode_id( id ) data = trans.sa_session.query( self.app.model.HistoryDatasetAssociation ).get( id ) else: trans.log_event( "Problem loading dataset id %s with history id %s." % ( str( id ), str( hid ) ) ) diff -r ba5b796311f3 -r c2a80b197ba5 templates/root/history_common.mako --- a/templates/root/history_common.mako Tue Apr 27 09:32:38 2010 -0400 +++ b/templates/root/history_common.mako Tue Apr 27 10:12:59 2010 -0400 @@ -47,7 +47,7 @@ %endif ></a> %if for_editing: - <a class="icon-button edit tooltip" title="Edit attributes" href="${h.url_for( controller='root', action='edit', id=data.id )}" target="galaxy_main"></a> + <a class="icon-button edit tooltip" title="Edit attributes" href="${h.url_for( controller='root', action='edit', id=trans.security.encode_id( data.id ) )}" target="galaxy_main"></a> %endif %endif %if for_editing: