Enhance collection to regular data field injection when multiple coll…

…ections are parsed
galaxyproject · Aug 1, 2016 · 24ecf34 · 24ecf34
1 parent 65328ff
commit 24ecf34
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/galaxy/workflow/modules.py b/lib/galaxy/workflow/modules.py
@@ -21,7 +21,7 @@
 from galaxy.tools.parameters.wrapped import make_dict_copy
 from galaxy.tools import DefaultToolState
 from galaxy.tools import ToolInputsNotReadyException
-from galaxy.util import odict
+from galaxy.util import odict, listify
 from galaxy.util.bunch import Bunch
 from galaxy.web.framework import formbuilder
 from tool_shed.util import common_util
@@ -1158,8 +1158,10 @@ def callback( input, prefixed_name, context, **kwargs ):
                             if output_step.type.startswith( 'data' ):
                                 output_inputs = output_step.module.get_runtime_inputs()
                                 output_value = output_inputs[ 'input' ].get_initial_value( self.trans, context )
-                                if isinstance( input, DataToolParameter ) and isinstance( output_value, self.trans.app.model.HistoryDatasetCollectionAssociation ):
-                                    output_value = output_value.to_hda_representative()
+                                if isinstance( input, DataToolParameter ):
+                                    for v in listify( output_value ):
+                                        if isinstance( v, self.trans.app.model.HistoryDatasetCollectionAssociation ):
+                                            return v.to_hda_representative()
                                 return output_value
                         return RuntimeValue()
                     else: