2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2cc8d10988e0/ Changeset: 2cc8d10988e0 Branch: stable User: carlfeberhard Date: 2013-04-05 19:07:50 Summary: controllers/history: use get_history in switch_to_history Affected #: 1 file diff -r beb6f6acb91a738901993c0d4a28f48be40989f5 -r 2cc8d10988e03257dc7b97f8bb332c7df745d1dd lib/galaxy/webapps/galaxy/controllers/history.py --- a/lib/galaxy/webapps/galaxy/controllers/history.py +++ b/lib/galaxy/webapps/galaxy/controllers/history.py @@ -1307,9 +1307,8 @@ @web.expose @web.require_login( "switch to a history" ) def switch_to_history( self, trans, hist_id=None ): - decoded_id = trans.security.decode_id(hist_id) - hist = trans.sa_session.query( trans.app.model.History ).get( decoded_id ) - trans.set_history( hist ) + history = self.get_history( trans, hist_id ) + trans.set_history( history ) return trans.response.send_redirect( url_for( "/" ) ) def get_item( self, trans, id ): https://bitbucket.org/galaxy/galaxy-central/commits/883216b2eaf2/ Changeset: 883216b2eaf2 User: carlfeberhard Date: 2013-04-05 19:09:11 Summary: merge to stable Affected #: 2 files diff -r c343129578ed39166985d337491cb09e1786b2c8 -r 883216b2eaf2ff05b7771f4ed2541be2ef1ed92f lib/galaxy/webapps/galaxy/controllers/history.py --- a/lib/galaxy/webapps/galaxy/controllers/history.py +++ b/lib/galaxy/webapps/galaxy/controllers/history.py @@ -1341,9 +1341,8 @@ @web.expose @web.require_login( "switch to a history" ) def switch_to_history( self, trans, hist_id=None ): - decoded_id = trans.security.decode_id(hist_id) - hist = trans.sa_session.query( trans.app.model.History ).get( decoded_id ) - trans.set_history( hist ) + history = self.get_history( trans, hist_id ) + trans.set_history( history ) return trans.response.send_redirect( url_for( "/" ) ) def get_item( self, trans, id ): Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.