From 9c187f0e5a613c925a733f6aeacd7e07f143f25b Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 23 Jan 2018 17:16:03 -0500 Subject: [PATCH] Constrain workflow tool panel entries to those not deleted. --- lib/galaxy/model/mapping.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/galaxy/model/mapping.py b/lib/galaxy/model/mapping.py index d4f0e0c245e..f80255b2ff9 100644 --- a/lib/galaxy/model/mapping.py +++ b/lib/galaxy/model/mapping.py @@ -1762,6 +1762,11 @@ mapper(model.User, model.User.table, properties=dict( galaxy_sessions=relation(model.GalaxySession, order_by=desc(model.GalaxySession.table.c.update_time)), stored_workflow_menu_entries=relation(model.StoredWorkflowMenuEntry, + primaryjoin=( + (model.StoredWorkflowMenuEntry.table.c.user_id == model.User.table.c.id) & + (model.StoredWorkflowMenuEntry.table.c.stored_workflow_id == model.StoredWorkflow.table.c.id) & + not_(model.StoredWorkflow.table.c.deleted) + ), backref="user", cascade="all, delete-orphan", collection_class=ordering_list('order_index')),