2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/caebda8c654a/ Changeset: caebda8c654a Branch: next-stable User: carlfeberhard Date: 2014-12-08 15:11:44+00:00 Summary: Fix to history_contents, dataset.url: use legacy route to prevent intermittent url_for GenerationException Affected #: 1 file diff -r 0a0dc401129472073a93a095ced211179ff1c5a4 -r caebda8c654aa079b68be736879df61c75f23faf 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 @@ -154,7 +154,11 @@ 'resubmitted': hda._state == trans.app.model.Dataset.states.RESUBMITTED, 'hid' : hda.hid, 'history_content_type' : hda.history_content_type, - 'url' : url_for( 'history_content_typed', history_id=encoded_history_id, id=encoded_id, type="dataset" ), + #'url' : url_for( 'history_content_typed', history_id=encoded_history_id, id=encoded_id, type="dataset" ), + #TODO: this intermittently causes a routes.GenerationException - temp use the legacy route to prevent this + # see also: https://trello.com/c/5d6j4X5y + # see also: https://sentry.galaxyproject.org/galaxy/galaxy-main/group/20769/events/93528... + '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/222404d100db/ Changeset: 222404d100db User: carlfeberhard Date: 2014-12-08 15:12:00+00:00 Summary: merge Affected #: 1 file diff -r 896c18ca6b2f1922f73fc74ba9f2bb6229fb54a1 -r 222404d100db80657e22dbcc9b51147563b19973 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 @@ -154,7 +154,11 @@ 'resubmitted': hda._state == trans.app.model.Dataset.states.RESUBMITTED, 'hid' : hda.hid, 'history_content_type' : hda.history_content_type, - 'url' : url_for( 'history_content_typed', history_id=encoded_history_id, id=encoded_id, type="dataset" ), + #'url' : url_for( 'history_content_typed', history_id=encoded_history_id, id=encoded_id, type="dataset" ), + #TODO: this intermittently causes a routes.GenerationException - temp use the legacy route to prevent this + # see also: https://trello.com/c/5d6j4X5y + # see also: https://sentry.galaxyproject.org/galaxy/galaxy-main/group/20769/events/93528... + 'url' : url_for( 'history_content', history_id=encoded_history_id, id=encoded_id ), } def __collection_dict( self, trans, dataset_collection_instance, view="collection" ): 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.