commit/galaxy-central: jmchilton: Don't allow tool form to submit with missing collection inputs if param non-optional.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/31aeeefd6020/ Changeset: 31aeeefd6020 User: jmchilton Date: 2014-07-25 16:17:38 Summary: Don't allow tool form to submit with missing collection inputs if param non-optional. Affected #: 2 files diff -r 8b98752f4fbc11fb50f23b219f9037e7afa9a234 -r 31aeeefd6020bfd61fa6587cce9e03cf670f62d6 lib/galaxy/tools/parameters/__init__.py --- a/lib/galaxy/tools/parameters/__init__.py +++ b/lib/galaxy/tools/parameters/__init__.py @@ -53,7 +53,7 @@ value = incoming_value error = None try: - if value is not None or isinstance( param, DataToolParameter ): + if value is not None or isinstance( param, DataToolParameter ) or isinstance( param, DataCollectionToolParameter ): # Convert value from HTML representation if source == 'html': value = param.from_html( value, trans, param_values ) diff -r 8b98752f4fbc11fb50f23b219f9037e7afa9a234 -r 31aeeefd6020bfd61fa6587cce9e03cf670f62d6 lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -2078,7 +2078,7 @@ def from_html( self, value, trans, other_values={} ): if not value and not self.optional: - raise ValueError( "History does not include a dataset of the required format / build" ) + 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 if isinstance( value, str ) and value.find( "," ) > 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