Merge pull request #71 from carlfeberhard/release_15.03

[STABLE] Fix: hda manager trans param in visualizations controller and tools api ...
This commit is contained in:
Dannon Baker
2015-04-02 11:49:41 -04:00
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -331,7 +331,7 @@ class ToolsController( BaseAPIController, UsesVisualizationMixin ):
# job's previous parameters and incoming parameters. Incoming parameters
# have priority.
#
original_job = self.hda_manager.creating_job( original_dataset )
original_job = self.hda_manager.creating_job( trans, original_dataset )
tool = trans.app.toolbox.get_tool( original_job.tool_id )
if not tool or not tool.allow_user_access( trans.user ):
return trans.app.model.Dataset.conversion_messages.NO_TOOL
@@ -985,7 +985,7 @@ class VisualizationController( BaseUIController, SharableMixin, UsesVisualizatio
else:
# Loading new visualization.
dataset = self.get_hda_or_ldda( trans, hda_ldda, dataset_id )
job = self.hda_manager.creating_job( dataset )
job = self.hda_manager.creating_job( trans, dataset )
viz_config = {
'dataset_id': dataset_id,
'tool_id': job.tool_id,
@@ -1017,7 +1017,7 @@ class VisualizationController( BaseUIController, SharableMixin, UsesVisualizatio
if dataset_id:
decoded_id = self.decode_id( dataset_id )
hda = self.hda_manager.get_accessible( trans, decoded_id, trans.user )
hda = self.hda_manager.error_if_uploading( hda )
hda = self.hda_manager.error_if_uploading( trans, hda )
else:
return trans.show_message( "Phyloviz couldn't find a dataset_id" )