From f5e5812473c453785db213497f0c16abf3da2409 Mon Sep 17 00:00:00 2001 From: Carl Eberhard Date: Thu, 2 Apr 2015 11:38:30 -0400 Subject: [PATCH] Fix: hda manager trans param in visualizations controller and tools api _rerun_tool --- lib/galaxy/webapps/galaxy/api/tools.py | 2 +- lib/galaxy/webapps/galaxy/controllers/visualization.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/api/tools.py b/lib/galaxy/webapps/galaxy/api/tools.py index fe91b878c09..45bc48af071 100644 --- a/lib/galaxy/webapps/galaxy/api/tools.py +++ b/lib/galaxy/webapps/galaxy/api/tools.py @@ -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 diff --git a/lib/galaxy/webapps/galaxy/controllers/visualization.py b/lib/galaxy/webapps/galaxy/controllers/visualization.py index 990fb5882d3..d1c9868939d 100644 --- a/lib/galaxy/webapps/galaxy/controllers/visualization.py +++ b/lib/galaxy/webapps/galaxy/controllers/visualization.py @@ -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" )