Merge remote-tracking branch 'upstream/release_18.09' into dev

galaxyproject · Nov 27, 2018 · 5a62a5c · 5a62a5c
2 parents 8033f0c + 2620367
commit 5a62a5c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
@@ -3932,6 +3932,13 @@ def get_internal_version(self, version):
             raise Exception("Version does not exist")
         return list(reversed(self.workflows))[version]
 
+    def show_in_tool_panel(self, user_id):
+        sa_session = object_session(self)
+        return bool(sa_session.query(StoredWorkflowMenuEntry).filter(
+            StoredWorkflowMenuEntry.stored_workflow_id == self.id,
+            StoredWorkflowMenuEntry.user_id == user_id,
+        ).count())
+
     def copy_tags_from(self, target_user, source_workflow):
         # Override to only copy owner tags.
         for src_swta in source_workflow.owner_tags:

diff --git a/lib/galaxy/webapps/galaxy/api/workflows.py b/lib/galaxy/webapps/galaxy/api/workflows.py
@@ -146,10 +146,7 @@ def get_workflows_list(self, trans, kwd):
             item['number_of_steps'] = wf.latest_workflow.step_count
             item['show_in_tool_panel'] = False
             if user is not None:
-                for x in user.stored_workflow_menu_entries:
-                    if x.stored_workflow_id == wf.id:
-                        item['show_in_tool_panel'] = True
-                        break
+                item['show_in_tool_panel'] = wf.show_in_tool_panel(user_id=user.id)
             rval.append(item)
         for wf_sa in trans.sa_session.query(model.StoredWorkflowUserShareAssociation).join(
                 model.StoredWorkflowUserShareAssociation.stored_workflow).options(
@@ -166,10 +163,7 @@ def get_workflows_list(self, trans, kwd):
             item['number_of_steps'] = wf_sa.stored_workflow.latest_workflow.step_count
             item['show_in_tool_panel'] = False
             if user is not None:
-                for x in user.stored_workflow_menu_entries:
-                    if x.stored_workflow_id == wf_sa.id:
-                        item['show_in_tool_panel'] = True
-                        break
+                item['show_in_tool_panel'] = wf_sa.stored_workflow.show_in_tool_panel(user_id=user.id)
             rval.append(item)
         if missing_tools:
             workflows_missing_tools = []