Unverified Commit cff711f7 authored by mvdbeek's avatar mvdbeek
Browse files

Raise appropriate exception if user forces non-ready collection as input

parent 8f4968f0

lib/galaxy/tools/parameters/dataset_matcher.py

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ class DatasetCollectionMatcher: 
    def dataset_collection_match(self, dataset_collection):

        # If dataset collection not yet populated, cannot determine if it

        # would be a valid match for this parameter.

        if not dataset_collection.populated:

        if not dataset_collection.populated_optimized:

            return False



        valid = True

lib/galaxy/tools/parameters/meta.py

+2 −0
Original line number Diff line number Diff line
@@ -242,6 +242,8 @@ def __expand_collection_parameter(trans, input_key, incoming_val, collections_to 
            subcollection_type = None

    hdc_id = trans.app.security.decode_id(encoded_hdc_id)

    hdc = trans.sa_session.get(HistoryDatasetCollectionAssociation, hdc_id)

    if not hdc.collection.populated_optimized:

        raise exceptions.ToolInputsNotReadyException("An input collection is not populated.")

    collections_to_match.add(input_key, hdc, subcollection_type=subcollection_type, linked=linked)

    if subcollection_type is not None:

        subcollection_elements = subcollections.split_dataset_collection_instance(hdc, subcollection_type)