1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/7732e2da1563/ Changeset: 7732e2da1563 User: dan Date: 2014-02-21 16:39:28 Summary: More fixes for multiple datasets with None Datasets. Affected #: 1 file diff -r 320dca6064fcbb0381c8d4b75c92c91b02285e2e -r 7732e2da1563682b911e08e445f103e7e58af78b lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1780,12 +1780,13 @@ def to_python( self, value, app ): # Both of these values indicate that no dataset is selected. However, 'None' # indicates that the dataset is optional, while '' indicates that it is not. - if value is None or value == '' or value == 'None': + none_values = [ None, '', 'None' ] + if value in none_values:# is None or value == '' or value == 'None': return value if isinstance(value, str) and value.find(",") > -1: values = value.split(",") # TODO: Optimize. -John - return [app.model.context.query( app.model.HistoryDatasetAssociation ).get( int( val ) ) for val in values] + return [ app.model.context.query( app.model.HistoryDatasetAssociation ).get( int( val ) ) for val in values if val not in none_values ] return app.model.context.query( app.model.HistoryDatasetAssociation ).get( int( value ) ) def to_param_dict_string( self, value, other_values={} ): 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.