1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/3975b317ffdc/ Changeset: 3975b317ffdc User: dannon Date: 2014-11-26 18:25:30+00:00 Summary: Merge next-stable. Affected #: 1 file
diff -r c5321f66c314cdfcaeb0aaedcc65c479558abf3a -r 3975b317ffdcbaa6c8dcb4b2b52404bfa34edbc2 lib/galaxy/workflow/modules.py --- a/lib/galaxy/workflow/modules.py +++ b/lib/galaxy/workflow/modules.py @@ -148,7 +148,7 @@ """ raise TypeError( "Abstract method" )
- def compute_runtime_state( self, trans, step_updates=None ): + def compute_runtime_state( self, trans, step_updates=None, source="html" ): """ Determine the runtime state (potentially different from self.state which describes configuration state). This (again unlike self.state) is currently always a `DefaultToolState` object. @@ -259,7 +259,7 @@ errors[ name ] = error return errors
- def compute_runtime_state( self, trans, step_updates=None ): + def compute_runtime_state( self, trans, step_updates=None, source="html" ): if step_updates and "tool_state" in step_updates: # Fix this for multiple inputs state = self.decode_runtime_state( trans, step_updates.pop( "tool_state" ) ) @@ -716,7 +716,7 @@ def check_and_update_state( self ): return self.tool.check_and_update_param_values( self.state.inputs, self.trans, allow_workflow_parameters=True )
- def compute_runtime_state( self, trans, step_updates=None ): + def compute_runtime_state( self, trans, step_updates=None, source="html" ): # Warning: This method destructively modifies existing step state. step_errors = None state = self.state @@ -727,7 +727,7 @@ old_errors = state.inputs.pop( "__errors__", {} ) # Update the state step_errors = tool.update_state( trans, tool.inputs, state.inputs, step_updates, - update_only=True, old_errors=old_errors, source="json" ) + update_only=True, old_errors=old_errors, source=source ) return state, step_errors
def execute( self, trans, progress, invocation, step ): @@ -956,7 +956,7 @@ def __init__( self, trans ): self.trans = trans
- def inject( self, step, step_args=None ): + def inject( self, step, step_args=None, source="html" ): """ Pre-condition: `step` is an ORM object coming from the database, if supplied `step_args` is the representation of the inputs for that step supplied via web form. @@ -998,7 +998,7 @@ # are not persisted so we need to do it every time) module.add_dummy_datasets( connections=step.input_connections )
- state, step_errors = module.compute_runtime_state( trans, step_args ) + state, step_errors = module.compute_runtime_state( trans, step_args, source=source ) step.state = state
return step_errors @@ -1011,7 +1011,7 @@ module_injector = WorkflowModuleInjector( trans ) for step in workflow.steps: step_args = param_map.get( step.id, {} ) - step_errors = module_injector.inject( step, step_args=step_args ) + step_errors = module_injector.inject( step, step_args=step_args, source="json" ) if step.type == 'tool' or step.type is None: if step_errors: message = "Workflow cannot be run because of validation errors in some steps: %s" % step_errors
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.