From ffed1573ffb33fa54ca0263ed7cb18d8ad9d48b5 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 26 Oct 2023 09:38:17 -0400 Subject: [PATCH] When exporting a workflow, include owner's annotation if the exporting user doesn't have an overriding one. --- lib/galaxy/managers/workflows.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py index 6106d0043517..8449c70f04d7 100644 --- a/lib/galaxy/managers/workflows.py +++ b/lib/galaxy/managers/workflows.py @@ -1337,7 +1337,12 @@ def _workflow_to_dict_export(self, trans, stored=None, workflow=None, internal=F tag_str = "" if stored is not None: if stored.id: - annotation_str = self.get_item_annotation_str(trans.sa_session, trans.user, stored) or "" + # if the active user doesn't have an annotation on the workflow, default to the owner's annotation. + annotation_str = ( + self.get_item_annotation_str(trans.sa_session, trans.user, stored) + or self.get_item_annotation_str(trans.sa_session, stored.user, stored) + or "" + ) tag_str = stored.make_tag_string_list() else: # dry run with flushed workflow objects, just use the annotation