2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/55cf8bb06007/ Changeset: 55cf8bb06007 User: jmchilton Date: 2014-03-18 17:33:05 Summary: Bring workflow parameter context inline with tool. When tool parameters are passed other_values when rendering tool forms - other_values is the context of other tools at their position in the tree, when rendering workflows other_values is the global state of the tool. The result is different handling of say parameter value filtering for tools and workflows. This changeset switches workflows/run.mako to use the same recursive calculation of context/other_values as tool_form.mako uses. Affected #: 1 file diff -r 0a9263af45ec678bea82a6d128f49cf5372d370d -r 55cf8bb0600772d4508cd725677725611e4d78d0 templates/webapps/galaxy/workflow/run.mako --- a/templates/webapps/galaxy/workflow/run.mako +++ b/templates/webapps/galaxy/workflow/run.mako @@ -313,9 +313,10 @@ %><%def name="do_inputs( inputs, values, errors, prefix, step, other_values = None, already_used = None )"> - %if other_values is None: - <% other_values = values %> - %endif + <% + from galaxy.util.expressions import ExpressionContext + other_values = ExpressionContext( values, other_values ) + %> %for input_index, input in enumerate( inputs.itervalues() ): %if input.type == "repeat": <div class="repeat-group"> https://bitbucket.org/galaxy/galaxy-central/commits/1285d07792b3/ Changeset: 1285d07792b3 User: jmchilton Date: 2014-03-20 22:05:49 Summary: Merged in jmchilton/galaxy-central-fork-1 (pull request #349) Bring workflow parameter context calculation in line with that of tools. Affected #: 1 file diff -r 7f7b154608e3e1c54d921d1e23277379f54293d9 -r 1285d07792b31e6c1ce9d66f559afc3f49a054a8 templates/webapps/galaxy/workflow/run.mako --- a/templates/webapps/galaxy/workflow/run.mako +++ b/templates/webapps/galaxy/workflow/run.mako @@ -313,9 +313,10 @@ %><%def name="do_inputs( inputs, values, errors, prefix, step, other_values = None, already_used = None )"> - %if other_values is None: - <% other_values = values %> - %endif + <% + from galaxy.util.expressions import ExpressionContext + other_values = ExpressionContext( values, other_values ) + %> %for input_index, input in enumerate( inputs.itervalues() ): %if input.type == "repeat": <div class="repeat-group"> 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.