1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/52de9815a7c4/ changeset: 52de9815a7c4 user: dannon date: 2011-12-05 17:29:31 summary: Fix for workflow multiple input regression from 6185:07f3f601d645. affected #: 1 file
diff -r e69c868b6891ccf6deabcba8a767cdf31593d1be -r 52de9815a7c4438c03daaa478df29c037e18f2a1 lib/galaxy/web/controllers/workflow.py --- a/lib/galaxy/web/controllers/workflow.py +++ b/lib/galaxy/web/controllers/workflow.py @@ -1432,7 +1432,7 @@ step.upgrade_messages = {} # Connections by input name step.input_connections_by_name = \ - dict( ( conn.input_name, conn ) for conn in step.input_connections ) + dict( ( conn.input_name, conn ) for conn in step.input_connections ) # Extract just the arguments for this step by prefix p = "%s|" % step.id l = len(p) @@ -1446,7 +1446,7 @@ has_upgrade_messages = True # Any connected input needs to have value DummyDataset (these # are not persisted so we need to do it every time) - module.add_dummy_datasets( connections=step.input_connections ) + module.add_dummy_datasets( connections=step.input_connections ) # Get the tool tool = module.tool # Get the state @@ -1462,7 +1462,7 @@ state = step.state = module.decode_runtime_state( trans, step_args.pop( "tool_state" ) ) step_errors = module.update_runtime_state( trans, state, step_args ) if step_errors: - errors[step.id] = state.inputs["__errors__"] = step_errors + errors[step.id] = state.inputs["__errors__"] = step_errors if 'run_workflow' in kwargs and not errors: new_history = None if 'new_history' in kwargs: @@ -1486,7 +1486,7 @@ tool = trans.app.toolbox.tools_by_id[ step.tool_id ] except KeyError, e: # Handle the case where the workflow requires a tool not available in the local Galaxy instance. - # The id value of tools installed from a Galaxy tool shed is a guid, but these tool's old_id + # The id value of tools installed from a Galaxy tool shed is a guid, but these tool's old_id # attribute should contain what we're looking for. for available_tool_id, available_tool in trans.app.toolbox.tools_by_id.items(): if step.tool_id == available_tool.old_id: @@ -1528,7 +1528,8 @@ invocations.append({'outputs': outputs, 'new_history': new_history}) trans.sa_session.flush() - return trans.fill_template( "workflow/run_complete.mako", + if invocations: + return trans.fill_template( "workflow/run_complete.mako", workflow=stored, invocations=invocations ) else: @@ -1549,7 +1550,7 @@ has_upgrade_messages = True # Any connected input needs to have value DummyDataset (these # are not persisted so we need to do it every time) - step.module.add_dummy_datasets( connections=step.input_connections ) + step.module.add_dummy_datasets( connections=step.input_connections ) # Store state with the step step.state = step.module.state # Error dict @@ -1568,7 +1569,7 @@ # Render the form stored.annotation = self.get_item_annotation_str( trans.sa_session, trans.user, stored ) return trans.fill_template( - "workflow/run.mako", + "workflow/run.mako", steps=workflow.steps, workflow=stored, has_upgrade_messages=has_upgrade_messages, @@ -1580,8 +1581,8 @@ finally: # restore the active history if saved_history is not None: - trans.set_history(saved_history) - + trans.set_history(saved_history) + def get_item( self, trans, id ): return self.get_stored_workflow( trans, id )
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.