From b1a9823a3c596a303973b8e1dbbd734a67c392ef Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 10 Mar 2016 12:26:24 -0500 Subject: [PATCH] Remove RuntimeValue arrays --- lib/galaxy/tools/parameters/basic.py | 2 -- lib/galaxy/workflow/modules.py | 13 ++----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py index 71183b5794d..02c439da200 100644 --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1670,7 +1670,6 @@ class BaseDataToolParameter( ToolParameter ): self.is_dynamic = self.options is not None def to_json( self, value, app ): - def single_to_json( value ): src = None if isinstance( value, galaxy.model.DatasetCollectionElement ): @@ -1680,7 +1679,6 @@ class BaseDataToolParameter( ToolParameter ): else: src = 'hda' return { 'id' : app.security.encode_id( value.id ), 'src' : src } - if value is not None: if isinstance( value, list ) and len( value ) > 0: values = [ single_to_json( v ) for v in value ] diff --git a/lib/galaxy/workflow/modules.py b/lib/galaxy/workflow/modules.py index 8b8dba47ead..784b2233caf 100644 --- a/lib/galaxy/workflow/modules.py +++ b/lib/galaxy/workflow/modules.py @@ -1141,19 +1141,10 @@ class ToolModule( WorkflowModule ): input_connections_by_name = {} # Any connected input needs to have value RuntimeValue (these # are not persisted so we need to do it every time) - def callback( input, prefixed_name, **kwargs ): - replacement = None - if isinstance( input, DataToolParameter ): + if isinstance( input, DataToolParameter ) or isinstance( input, DataCollectionToolParameter ): if connections is None or prefixed_name in input_connections_by_name: - if input.multiple: - replacement = [] if not connections else [RuntimeValue() for conn in connections] - else: - replacement = RuntimeValue() - elif isinstance( input, DataCollectionToolParameter ): - if connections is None or prefixed_name in input_connections_by_name: - replacement = RuntimeValue() - return replacement + return RuntimeValue() visit_input_values( self.tool.inputs, self.state.inputs, callback )