commit/galaxy-central: natefoo: Handle the varying sample ID param name ('id' or 'sample_id') in /requests_admin/manage_datasets
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/cdf84aee000b/ changeset: cdf84aee000b user: natefoo date: 2012-07-27 18:39:24 summary: Handle the varying sample ID param name ('id' or 'sample_id') in /requests_admin/manage_datasets affected #: 1 file diff -r aedb20d3dd7e9a1e0638c7ffb85d0993c501c30f -r cdf84aee000b28bd73bbae56b31480e9ce5a6a86 lib/galaxy/web/controllers/requests_admin.py --- a/lib/galaxy/web/controllers/requests_admin.py +++ b/lib/galaxy/web/controllers/requests_admin.py @@ -198,7 +198,13 @@ params = util.Params( kwd ) message = util.restore_text( params.get( 'message', '' ) ) status = params.get( 'status', 'done' ) + # When this method is called due to a grid operation, the sample ID + # will be in the param 'id'. But when this method is called via a + # redirect from another method, the ID will be in 'sample_id'. So, + # check for 'id' if 'sample_id' is not provided. sample_id = params.get( 'sample_id', None ) + if sample_id is None: + sample_id = params.get( 'id', None ) try: sample = trans.sa_session.query( trans.model.Sample ).get( trans.security.decode_id ( sample_id ) ) except: 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.
participants (1)
-
Bitbucket