3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ddddb19cb1bf/ Changeset: ddddb19cb1bf Branch: stable User: jmchilton Date: 2014-06-11 19:37:24 Summary: Modify url_for in history_contents.py. No clue why - but this randomly fails on main. Will keep looking into it - but it wasn't really giving the pretty URL I wanted anyway (though it was working and this still works due to backward compatbility on this route). Affected #: 1 file diff -r 0af48b3c8f33fbe0f05e775f98a14761804c7ac5 -r ddddb19cb1bf2c12aa4d6f824b7a850d4c858e2c lib/galaxy/webapps/galaxy/api/history_contents.py --- a/lib/galaxy/webapps/galaxy/api/history_contents.py +++ b/lib/galaxy/webapps/galaxy/api/history_contents.py @@ -143,7 +143,7 @@ 'purged': hda.purged, 'hid' : hda.hid, 'history_content_type' : hda.history_content_type, - 'url' : url_for( 'history_content', history_id=encoded_history_id, id=encoded_id, type="dataset" ), + 'url' : url_for( 'history_content', history_id=encoded_history_id, id=encoded_id ), } def __collection_dict( self, trans, dataset_collection_instance, view="collection" ): https://bitbucket.org/galaxy/galaxy-central/commits/f7be4e7782c1/ Changeset: f7be4e7782c1 Branch: stable User: dannon Date: 2014-06-11 17:39:21 Summary: Correct tools handling of tool.handle_input -- this doesn't always return a successful job. Affected #: 1 file diff -r ddddb19cb1bf2c12aa4d6f824b7a850d4c858e2c -r f7be4e7782c1368a3c4a868c7c63989e11c151fd lib/galaxy/webapps/galaxy/api/tools.py --- a/lib/galaxy/webapps/galaxy/api/tools.py +++ b/lib/galaxy/webapps/galaxy/api/tools.py @@ -156,7 +156,7 @@ output_dict[ 'output_name' ] = output_name outputs.append( trans.security.encode_dict_ids( output_dict ) ) - for job in vars[ 'jobs' ]: + for job in vars.get('jobs', []): rval[ 'jobs' ].append( self.encode_all_ids( trans, job.to_dict( view='collection' ), recursive=True ) ) for output_name, collection_instance in vars.get( 'implicit_collections', {} ).iteritems(): https://bitbucket.org/galaxy/galaxy-central/commits/5a9adea86d41/ Changeset: 5a9adea86d41 Branch: stable User: natefoo Date: 2014-06-12 14:50:00 Summary: Merged in jmchilton/galaxy-central-fork-1/stable (pull request #415) [stable] API bug fixes for stable Affected #: 2 files diff -r ca53bc55bdc5f8c0d8089da2f42cf9d81f0a15d4 -r 5a9adea86d411348023b7307b3c935cd99c6dea9 lib/galaxy/webapps/galaxy/api/history_contents.py --- a/lib/galaxy/webapps/galaxy/api/history_contents.py +++ b/lib/galaxy/webapps/galaxy/api/history_contents.py @@ -143,7 +143,7 @@ 'purged': hda.purged, 'hid' : hda.hid, 'history_content_type' : hda.history_content_type, - 'url' : url_for( 'history_content', history_id=encoded_history_id, id=encoded_id, type="dataset" ), + 'url' : url_for( 'history_content', history_id=encoded_history_id, id=encoded_id ), } def __collection_dict( self, trans, dataset_collection_instance, view="collection" ): diff -r ca53bc55bdc5f8c0d8089da2f42cf9d81f0a15d4 -r 5a9adea86d411348023b7307b3c935cd99c6dea9 lib/galaxy/webapps/galaxy/api/tools.py --- a/lib/galaxy/webapps/galaxy/api/tools.py +++ b/lib/galaxy/webapps/galaxy/api/tools.py @@ -156,7 +156,7 @@ output_dict[ 'output_name' ] = output_name outputs.append( trans.security.encode_dict_ids( output_dict ) ) - for job in vars[ 'jobs' ]: + for job in vars.get('jobs', []): rval[ 'jobs' ].append( self.encode_all_ids( trans, job.to_dict( view='collection' ), recursive=True ) ) for output_name, collection_instance in vars.get( 'implicit_collections', {} ).iteritems(): 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.