2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/03f7d79212ec/ Changeset: 03f7d79212ec Branch: stable User: jmchilton Date: 2014-01-27 03:47:59 Summary: Bugfix: Disallow shared workflows from being inappropriately deletable... ... by user workflow is shared with via workflow API. Affected #: 1 file diff -r 87b586afb05428a3b0ae37d68c79241994a27021 -r 03f7d79212ecf626af4940296e663c376b9cd2ee lib/galaxy/webapps/galaxy/api/workflows.py --- a/lib/galaxy/webapps/galaxy/api/workflows.py +++ b/lib/galaxy/webapps/galaxy/api/workflows.py @@ -296,9 +296,8 @@ # 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: - trans.response.status = 403 - return("Workflow is not owned by or shared with current user") + trans.response.status = 403 + return("Workflow is not owned by current user") #Mark a workflow as deleted stored_workflow.deleted = True https://bitbucket.org/galaxy/galaxy-central/commits/a7ac443f9c9b/ Changeset: a7ac443f9c9b User: jmchilton Date: 2014-01-27 03:48:23 Summary: Merge latest stable. Affected #: 1 file diff -r e410940a015c5245f2d065b8f7a9eda8da56d966 -r a7ac443f9c9b7b5383284149db4bcc6a99e4b124 lib/galaxy/webapps/galaxy/api/workflows.py --- a/lib/galaxy/webapps/galaxy/api/workflows.py +++ b/lib/galaxy/webapps/galaxy/api/workflows.py @@ -325,9 +325,8 @@ # 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: - trans.response.status = 403 - return("Workflow is not owned by or shared with current user") + trans.response.status = 403 + return("Workflow is not owned by current user") #Mark a workflow as deleted stored_workflow.deleted = True 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.