1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/3bdfcb0a7e97/ changeset: 3bdfcb0a7e97 user: dannon date: 2013-03-06 17:50:53 summary: Fix incorrect workflow download path via the API. Now is is correctly set to /api/workflows/<id>/download affected #: 2 files diff -r f97ebc1cf57d20019b785106221964931b122bb7 -r 3bdfcb0a7e9722ce4074c52528a4c0324f2fb83a lib/galaxy/webapps/galaxy/api/workflows.py --- a/lib/galaxy/webapps/galaxy/api/workflows.py +++ b/lib/galaxy/webapps/galaxy/api/workflows.py @@ -258,24 +258,16 @@ trans.sa_session.flush() return rval - # ---------------------------------------------------------------------------------------------- # - # ---------------------------------------------------------------------------------------------- # - # ---- RPARK EDITS ---- # - # ---------------------------------------------------------------------------------------------- # - # ---------------------------------------------------------------------------------------------- # @web.expose_api - #@web.json def workflow_dict( self, trans, workflow_id, **kwd ): """ GET /api/workflows/{encoded_workflow_id}/download Returns a selected workflow as a json dictionary. """ - try: stored_workflow = trans.sa_session.query(self.app.model.StoredWorkflow).get(trans.security.decode_id(workflow_id)) except Exception,e: return ("Workflow with ID='%s' can not be found\n Exception: %s") % (workflow_id, str( e )) - # check to see if user has permissions to selected workflow if stored_workflow.user != trans.user and not trans.user_is_admin(): if trans.sa_session.query(trans.app.model.StoredWorkflowUserShareAssociation).filter_by(user=trans.user, stored_workflow=stored_workflow).count() == 0: diff -r f97ebc1cf57d20019b785106221964931b122bb7 -r 3bdfcb0a7e9722ce4074c52528a4c0324f2fb83a lib/galaxy/webapps/galaxy/buildapp.py --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -152,7 +152,7 @@ # "POST /api/workflows/import" => ``workflows.import_workflow()``. # Defines a named route "import_workflow". webapp.api_mapper.connect("import_workflow", "/api/workflows/upload", controller="workflows", action="import_new_workflow", conditions=dict(method=["POST"])) - webapp.api_mapper.connect("workflow_dict", '/api/workflows/download/{workflow_id}', controller='workflows', action='workflow_dict', conditions=dict(method=['GET'])) + webapp.api_mapper.connect("workflow_dict", '/api/workflows/{workflow_id}/download', controller='workflows', action='workflow_dict', conditions=dict(method=['GET'])) # Connect logger from app if app.trace_logger: 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.