details: http://www.bx.psu.edu/hg/galaxy/rev/e8f25fc7dde0 changeset: 1618:e8f25fc7dde0 user: James Taylor <james@jamestaylor.org> date: Mon Nov 10 15:38:29 2008 -0500 description: Automated merge with ssh://scofield.bx.psu.edu//depot/projects/universe/hg 0 file(s) affected in this change: diffs (31 lines): diff -r 330bf412f311 -r e8f25fc7dde0 lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py Mon Nov 10 15:30:07 2008 -0500 +++ b/lib/galaxy/model/__init__.py Mon Nov 10 15:38:29 2008 -0500 @@ -573,7 +573,7 @@ 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 -r 330bf412f311 -r e8f25fc7dde0 lib/galaxy/web/controllers/workflow.py --- a/lib/galaxy/web/controllers/workflow.py Mon Nov 10 15:30:07 2008 -0500 +++ b/lib/galaxy/web/controllers/workflow.py Mon Nov 10 15:38:29 2008 -0500 @@ -306,7 +306,6 @@ 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 @@ 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 )