Remove unvalidated value handling in workflow extraction

This commit is contained in:
guerler
2016-01-26 14:49:34 -05:00
parent 3acdee5143
commit b38479c4a4
3 changed files with 2 additions and 5 deletions
+1 -1
View File
@@ -1614,7 +1614,7 @@ class DrillDownSelectToolParameter( SelectToolParameter ):
recurse_options( initial_values, option['options'] )
# More working around dynamic options for workflow
options = self.get_options( trans=trans, other_values=other_values )
if len(list(options)) == 0 and trans.workflow_building_mode:
if len( list( options ) ) == 0 and trans.workflow_building_mode:
return None
initial_values = []
recurse_options( initial_values, options )
+1 -1
View File
@@ -18,7 +18,7 @@ class WorkRequestContext( ProvidesAppContext, ProvidesUserContext, ProvidesHisto
objects.
"""
def __init__( self, app, user=None, history=None, workflow_building_mode=None ):
def __init__( self, app, user=None, history=None, workflow_building_mode=False ):
self.app = app
self.security = app.security
self.__user = user
-3
View File
@@ -317,9 +317,6 @@ def __cleanup_param_values( inputs, values ):
# Recursively clean data inputs and dynamic selects
def cleanup( prefix, inputs, values ):
for key, input in inputs.items():
if isinstance( input, ( SelectToolParameter, DrillDownSelectToolParameter ) ):
if input.is_dynamic and not isinstance( values[key], UnvalidatedValue ):
values[key] = UnvalidatedValue( values[key] )
if isinstance( input, DataToolParameter ) or isinstance( input, DataCollectionToolParameter ):
tmp = values[key]
values[key] = None