commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/5abd9fc76f7a/ Changeset: 5abd9fc76f7a Branch: stable User: dan Date: 2014-09-15 20:58:14 Summary: Fix for handling unvalidated values in select lists. Addresses https://trello.com/c/5DKHp4ck Affected #: 1 file diff -r e8453771b1dbfe462974b63216e00752fb8c4097 -r 5abd9fc76f7ad2eca013a1f81a77a4d3fe28328a lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -783,6 +783,8 @@ if value is not None: if not isinstance( value, list ): value = [ value ] + # We could have an unvalidated value here when e.g. running a workflow. + value = [ val.value if isinstance( val, UnvalidatedValue ) else val for val in value ] field = form_builder.SelectField( self.name, self.multiple, self.display, self.refresh_on_change, refresh_on_change_values=self.refresh_on_change_values ) options = self.get_options( trans, context ) for text, optval, selected in options: https://bitbucket.org/galaxy/galaxy-central/commits/2c0a15d8d6b4/ Changeset: 2c0a15d8d6b4 Branch: stable User: jmchilton Date: 2014-09-15 21:17:02 Summary: Merged in dan/galaxy-central-prs/stable (pull request #494) [STABLE] Fix for handling unvalidated values in select lists. Addresses https://trello.com/c/5DKHp4ck Affected #: 1 file diff -r db520d1547165e56b3a0a0ff01fb854c0f93e4b1 -r 2c0a15d8d6b4a98295df6f3b614bb54da452d1d9 lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -783,6 +783,8 @@ if value is not None: if not isinstance( value, list ): value = [ value ] + # We could have an unvalidated value here when e.g. running a workflow. + value = [ val.value if isinstance( val, UnvalidatedValue ) else val for val in value ] field = form_builder.SelectField( self.name, self.multiple, self.display, self.refresh_on_change, refresh_on_change_values=self.refresh_on_change_values ) options = self.get_options( trans, context ) for text, optval, selected in options: 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