details: http://www.bx.psu.edu/hg/galaxy/rev/0571bc517c2f changeset: 3704:0571bc517c2f user: jeremy goecks <jeremy.goecks@emory.edu> date: Tue Apr 27 13:52:26 2010 -0400 description: Rollback to unencoded HDAs. diffstat: lib/galaxy/web/controllers/root.py | 3 +-- templates/dataset/edit_attributes.mako | 2 +- templates/root/history_common.mako | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diffs (37 lines): diff -r 6ba1b83f5f3a -r 0571bc517c2f lib/galaxy/web/controllers/root.py --- a/lib/galaxy/web/controllers/root.py Tue Apr 27 13:23:05 2010 -0400 +++ b/lib/galaxy/web/controllers/root.py Tue Apr 27 13:52:26 2010 -0400 @@ -253,8 +253,7 @@ history = trans.get_history() # TODO: hid handling data = history.datasets[ int( hid ) - 1 ] - elif id is not None: - id = trans.security.decode_id( id ) + elif id is not None: 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 6ba1b83f5f3a -r 0571bc517c2f templates/dataset/edit_attributes.mako --- a/templates/dataset/edit_attributes.mako Tue Apr 27 13:23:05 2010 -0400 +++ b/templates/dataset/edit_attributes.mako Tue Apr 27 13:52:26 2010 -0400 @@ -32,7 +32,7 @@ <div class="toolFormTitle">${_('Edit Attributes')}</div> <div class="toolFormBody"> <form name="edit_attributes" action="${h.url_for( controller='root', action='edit' )}" method="post"> - <input type="hidden" name="id" value="${trans.security.encode_id( data.id )}"/> + <input type="hidden" name="id" value="${data.id}"/> <div class="form-row"> <label> Name: diff -r 6ba1b83f5f3a -r 0571bc517c2f templates/root/history_common.mako --- a/templates/root/history_common.mako Tue Apr 27 13:23:05 2010 -0400 +++ b/templates/root/history_common.mako Tue Apr 27 13:52:26 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=trans.security.encode_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=data.id )}" target="galaxy_main"></a> %endif %endif %if for_editing: