Get tools with tool_version in more places

This commit is contained in:
mvdbeek
2017-08-08 17:25:20 +02:00
parent e92a15a185
commit a060690c3a
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -373,7 +373,7 @@ class WorkflowContentsManager(UsesAnnotations):
step_model = None
if step.type == 'tool':
incoming = {}
tool = trans.app.toolbox.get_tool( step.tool_id )
tool = trans.app.toolbox.get_tool( step.tool_id, tool_version=step.tool_version )
params_to_incoming( incoming, tool.inputs, step.state.inputs, trans.app )
step_model = tool.to_json( trans, incoming, workflow_building_mode=workflow_building_modes.USE_HISTORY )
step_model[ 'post_job_actions' ] = [{
+1 -1
View File
@@ -892,7 +892,7 @@ class UsesVisualizationMixin( UsesLibraryMixinItems ):
if not job:
return None
tool = trans.app.toolbox.get_tool( job.tool_id )
tool = trans.app.toolbox.get_tool( job.tool_id, tool_version=job.tool_version )
if not tool:
return None
+1 -1
View File
@@ -305,7 +305,7 @@ class WorkflowSummary( object ):
def step_inputs( trans, job ):
tool = trans.app.toolbox.get_tool( job.tool_id )
tool = trans.app.toolbox.get_tool( job.tool_id, tool_version=job.tool_version )
param_values = job.get_param_values( trans.app, ignore_errors=True ) # If a tool was updated and e.g. had a text value changed to an integer, we don't want a traceback here
associations = __cleanup_param_values( tool.inputs, param_values )
tool_inputs = tool.params_to_strings( param_values, trans.app )
+1 -1
View File
@@ -49,7 +49,7 @@ class RepoToolModule( ToolModule ):
break
else:
# We're in Galaxy.
self.tool = trans.app.toolbox.get_tool( self.tool_id )
self.tool = trans.app.toolbox.get_tool( self.tool_id, tool_version=self.tool_version )
if self.tool is None:
self.errors = 'unavailable'
self.post_job_actions = {}