From 5393107a42fe6ef2a5942e56a870939026322b5c Mon Sep 17 00:00:00 2001 From: Marius van den Beek Date: Mon, 8 Feb 2016 12:20:37 +0100 Subject: [PATCH 1/2] Copy over element_identifier to HDA. --- lib/galaxy/workflow/modules.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/galaxy/workflow/modules.py b/lib/galaxy/workflow/modules.py index 4433d6b8b9d..f1c5c2da996 100644 --- a/lib/galaxy/workflow/modules.py +++ b/lib/galaxy/workflow/modules.py @@ -1145,6 +1145,7 @@ class ToolModule( WorkflowModule ): if isinstance( input, DataToolParameter ): # Pull out dataset instance from element. replacement = iteration_elements[ prefixed_name ].dataset_instance + replacement.element_identifier = iteration_elements[ prefixed_name ].element_identifier else: # If collection - just use element model object. replacement = iteration_elements[ prefixed_name ] From 19efb1a99d5b46056392826324507fa952872591 Mon Sep 17 00:00:00 2001 From: Marius van den Beek Date: Mon, 8 Feb 2016 12:32:02 +0100 Subject: [PATCH 2/2] Test if element_identifer is defined. --- lib/galaxy/workflow/modules.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/workflow/modules.py b/lib/galaxy/workflow/modules.py index f1c5c2da996..2a276eb5333 100644 --- a/lib/galaxy/workflow/modules.py +++ b/lib/galaxy/workflow/modules.py @@ -1145,7 +1145,8 @@ class ToolModule( WorkflowModule ): if isinstance( input, DataToolParameter ): # Pull out dataset instance from element. replacement = iteration_elements[ prefixed_name ].dataset_instance - replacement.element_identifier = iteration_elements[ prefixed_name ].element_identifier + if hasattr(iteration_elements[ prefixed_name ], u'element_identifier') and iteration_elements[ prefixed_name ].element_identifier: + replacement.element_identifier = iteration_elements[ prefixed_name ].element_identifier else: # If collection - just use element model object. replacement = iteration_elements[ prefixed_name ]