Merge pull request #4427 from nsoranzo/merge_release_17.05

Merge release_17.05 into dev
This commit is contained in:
Dannon Baker
2017-08-15 11:36:16 -04:00
committed by GitHub
+3 -1
View File
@@ -573,7 +573,9 @@ class ToolModule( WorkflowModule ):
tool_id = d.get( 'content_id' ) or d.get( 'tool_id' )
if tool_id is None:
raise exceptions.RequestParameterInvalidException( "No tool id could be located for step [%s]." % d )
tool_version = str( d.get( 'tool_version' ) )
tool_version = d.get( 'tool_version' )
if tool_version:
tool_version = str(tool_version)
module = super( ToolModule, Class ).from_dict( trans, d, tool_id=tool_id, tool_version=tool_version, exact_tools=exact_tools )
module.post_job_actions = d.get( 'post_job_actions', {} )
module.workflow_outputs = d.get( 'workflow_outputs', [] )