From 4c883d689e7c3d99ee13313ba2ca3a5b6b4821ce Mon Sep 17 00:00:00 2001 From: guerler Date: Wed, 15 Apr 2015 17:33:22 -0400 Subject: [PATCH] Fix genome build and revise drill down parameter --- lib/galaxy/tools/parameters/basic.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py index 31ee1b4152f..2501ce82e1e 100644 --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -962,7 +962,7 @@ class SelectToolParameter( ToolParameter ): def get_initial_value( self, trans, context, history=None ): # More working around dynamic options for workflow options = list( self.get_options( trans, context ) ) - if len(list(options)) == 0 and (trans is None or trans.workflow_building_mode): + if len(options) == 0 and (trans is None or trans.workflow_building_mode): # Really the best we can do? return UnvalidatedValue( None ) value = [ optval for _, optval, selected in options if selected ] @@ -1577,12 +1577,11 @@ class DrillDownSelectToolParameter( SelectToolParameter ): initial_values.append( option['value'] ) recurse_options( initial_values, option['options'] ) # More working around dynamic options for workflow - initial_values = [] - recurse_options( initial_values, self.get_options( trans=trans, other_values=context ) ) - if len(list(initial_values)) == 0 and (trans is None or trans.workflow_building_mode): + options = self.get_options( trans=trans, other_values=context ) + if len(list(options)) == 0 and (trans is None or trans.workflow_building_mode): return UnvalidatedValue( None ) initial_values = [] - recurse_options( initial_values, self.get_options( trans=trans, other_values=context ) ) + recurse_options( initial_values, options ) if len( initial_values ) == 0: initial_values = None return initial_values