commit/galaxy-central: jmchilton: Re-attempt fix in 37cf9cd.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/1deca66fc876/ Changeset: 1deca66fc876 User: jmchilton Date: 2014-12-04 03:38:37+00:00 Summary: Re-attempt fix in 37cf9cd. Affected #: 2 files diff -r f2e8f6fdeb720a4c1d4643306f45f13bb9fc8924 -r 1deca66fc876e855e8f286b6f0cd610227276e48 lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -2222,10 +2222,6 @@ raise ValueError( "History does not include a dataset collection of the correct type or containing the correct types of datasets" ) if value in [None, "None"]: return None - # would really like to not need to handle lists in here but - # doing it for uniformity with DataToolParameters for now. - if isinstance( value, list ): - value = value[ 0 ] if isinstance( value, str ) and value.find( "," ) > 0: value = [ int( value_part ) for value_part in value.split( "," ) ] elif isinstance( value, trans.app.model.HistoryDatasetCollectionAssociation ): diff -r f2e8f6fdeb720a4c1d4643306f45f13bb9fc8924 -r 1deca66fc876e855e8f286b6f0cd610227276e48 lib/galaxy/tools/parameters/meta.py --- a/lib/galaxy/tools/parameters/meta.py +++ b/lib/galaxy/tools/parameters/meta.py @@ -123,6 +123,10 @@ def __collection_multirun_parameter( value ): + is_batch = value.get( 'batch', False ) + if not is_batch: + return False + batch_values = util.listify( value[ 'values' ] ) if len( batch_values ) == 1: batch_over = batch_values[ 0 ] 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.
participants (1)
-
commits-noreply@bitbucket.org