2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ef882ec18f1c/ changeset: ef882ec18f1c user: jmchilton date: 2013-02-15 22:58:30 summary: Fix to allow multiple input tool parameters in conditionals and repeats. affected #: 1 file diff -r ec4da708e45175610a33d16fcfc68732e425f54f -r ef882ec18f1c6c779796cde62ca035c826197bc9 lib/galaxy/tools/actions/__init__.py --- a/lib/galaxy/tools/actions/__init__.py +++ b/lib/galaxy/tools/actions/__init__.py @@ -76,10 +76,10 @@ else: raise Exception, 'A path for explicit datatype conversion has not been found: %s --/--> %s' % ( input_datasets[ prefix + input.name + str( i + 1 ) ].extension, conversion_extensions ) if parent: - parent[input.name] = input_datasets[ prefix + input.name + str( i + 1 ) ] + parent[input.name][i] = input_datasets[ prefix + input.name + str( i + 1 ) ] for conversion_name, conversion_data in conversions: #allow explicit conversion to be stored in job_parameter table - parent[ conversion_name ] = conversion_data.id #a more robust way to determine JSONable value is desired + parent[ conversion_name ][i] = conversion_data.id #a more robust way to determine JSONable value is desired else: param_values[input.name][i] = input_datasets[ prefix + input.name + str( i + 1 ) ] for conversion_name, conversion_data in conversions: https://bitbucket.org/galaxy/galaxy-central/commits/2fc2d5ef6369/ changeset: 2fc2d5ef6369 user: dannon date: 2013-02-15 23:18:46 summary: Merged in jmchilton/galaxy-central-multi-input-tool-fixes-2 (pull request #125) Fix to allow multiple input tool parameters in conditionals and repeats. affected #: 1 file diff -r 8e93ca10b0e2523ba78a02bfb36e371db5f17e0a -r 2fc2d5ef636913bdb29c4f9ecea42e440a2c326a lib/galaxy/tools/actions/__init__.py --- a/lib/galaxy/tools/actions/__init__.py +++ b/lib/galaxy/tools/actions/__init__.py @@ -76,10 +76,10 @@ else: raise Exception, 'A path for explicit datatype conversion has not been found: %s --/--> %s' % ( input_datasets[ prefix + input.name + str( i + 1 ) ].extension, conversion_extensions ) if parent: - parent[input.name] = input_datasets[ prefix + input.name + str( i + 1 ) ] + parent[input.name][i] = input_datasets[ prefix + input.name + str( i + 1 ) ] for conversion_name, conversion_data in conversions: #allow explicit conversion to be stored in job_parameter table - parent[ conversion_name ] = conversion_data.id #a more robust way to determine JSONable value is desired + parent[ conversion_name ][i] = conversion_data.id #a more robust way to determine JSONable value is desired else: param_values[input.name][i] = input_datasets[ prefix + input.name + str( i + 1 ) ] for conversion_name, conversion_data in conversions: 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.