1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/e8e361707865/ changeset: e8e361707865 user: dannon date: 2012-03-20 15:34:01 summary: Fix owner_tag mapping of StoredWorkflow. Previously this mapping incorrectly retrieved *all* workflow tags owned by the user. affected #: 1 file diff -r d388551528e97128401a048c7638d1b4becaca53 -r e8e36170786518dc8d31ba3d6758e08d345875b5 lib/galaxy/model/mapping.py --- a/lib/galaxy/model/mapping.py +++ b/lib/galaxy/model/mapping.py @@ -1566,7 +1566,7 @@ assign_mapper( context, StoredWorkflow, StoredWorkflow.table, - properties=dict( user=relation( User, + properties=dict( user=relation( User, primaryjoin=( User.table.c.id == StoredWorkflow.table.c.user_id ), backref='stored_workflows' ), workflows=relation( Workflow, backref='stored_workflow', @@ -1575,16 +1575,15 @@ latest_workflow=relation( Workflow, post_update=True, primaryjoin=( StoredWorkflow.table.c.latest_workflow_id == Workflow.table.c.id ), lazy=False ), - tags=relation( StoredWorkflowTagAssociation, order_by=StoredWorkflowTagAssociation.table.c.id, backref="stored_workflows" ), - owner_tags=relation( StoredWorkflowTagAssociation, + tags=relation( StoredWorkflowTagAssociation, order_by=StoredWorkflowTagAssociation.table.c.id, backref="stored_workflows" ), + owner_tags=relation( StoredWorkflowTagAssociation, primaryjoin=and_( StoredWorkflow.table.c.id == StoredWorkflowTagAssociation.table.c.stored_workflow_id, StoredWorkflow.table.c.user_id == StoredWorkflowTagAssociation.table.c.user_id ), - foreign_keys=[StoredWorkflowTagAssociation.table.c.user_id], order_by=StoredWorkflowTagAssociation.table.c.id ), annotations=relation( StoredWorkflowAnnotationAssociation, order_by=StoredWorkflowAnnotationAssociation.table.c.id, backref="stored_workflows" ), ratings=relation( StoredWorkflowRatingAssociation, order_by=StoredWorkflowRatingAssociation.table.c.id, backref="stored_workflows" ) ) ) - + # Set up proxy so that # StoredWorkflow.users_shared_with # returns a list of users that workflow is shared with. 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.