From ad077dda6a0e29e22db1237085707c1a78b9f6c5 Mon Sep 17 00:00:00 2001 From: James Taylor Date: Mon, 10 Nov 2008 15:37:21 -0500 Subject: [PATCH] imported patch workflow-bugfix-10Nov2008 --- lib/galaxy/model/__init__.py | 2 +- lib/galaxy/web/controllers/workflow.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index c72fd6e109c..1b0c3cef020 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -573,7 +573,7 @@ class WorkflowStep( object ): self.tool_inputs = None self.tool_errors = None self.position = None - self.input_connections = None + self.input_connections = [] self.config = None class WorkflowStepConnection( object ): diff --git a/lib/galaxy/web/controllers/workflow.py b/lib/galaxy/web/controllers/workflow.py index 0e51e2352d1..027d280dca2 100644 --- a/lib/galaxy/web/controllers/workflow.py +++ b/lib/galaxy/web/controllers/workflow.py @@ -306,7 +306,6 @@ class WorkflowController( BaseController ): workflow.stored_workflow = stored stored.latest_workflow = workflow # Persist - trans.sa_session.save( stored ) trans.sa_session.flush() # Return something informative errors = [] @@ -520,6 +519,7 @@ class WorkflowController( BaseController ): outputs[ step.id ] = tool.execute( trans, step.state.inputs ) else: outputs[ step.id ] = step.module.execute( trans, step.state ) + return trans.fill_template( "workflow/run_complete.mako", workflow=stored, outputs=outputs )