Skip to content

Commit

Permalink
Merge pull request #18385 from mvdbeek/fix_inputs_ready_check
Browse files Browse the repository at this point in the history
[24.0] Fix null inputs in database operation tools
  • Loading branch information
jdavcs authored Jun 12, 2024
2 parents 4ba1ee5 + b2d52ac commit 4fd73fc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 3 additions & 1 deletion lib/galaxy/tools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3235,7 +3235,9 @@ def check_dataset_state(state):
)

for input_dataset in input_datasets.values():
check_dataset_state(input_dataset.state)
if input_dataset:
# None is a possible input for optional inputs
check_dataset_state(input_dataset.state)

for input_dataset_collection_pairs in input_dataset_collections.values():
for input_dataset_collection, _ in input_dataset_collection_pairs:
Expand Down
3 changes: 2 additions & 1 deletion lib/galaxy/tools/build_list_1.2.0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Description
This tool combines individual datasets or collections into a new collection. The simplest scenario is building a new colection from individual datasets (case **A** in the image below). You can merge a collection with individual dataset(s). In this case (see **B** in the image below) the individual dataset(s) will be merged with each element of the input collection to create a nested collection. Finally, two or more collection can be merged together creating a nested collection (case **C** in the image below).
.. class:: warningmark
.. class:: warningmark
**Note**: When merging collections (e.g., case **C** below) the input collection **must** have equal number of elements.
Expand Down Expand Up @@ -77,6 +77,7 @@ This tool will create a new collection from your history datasets but your quota
</test>
<test>
<repeat name="datasets">
<param name="input" value_json="null"/>
</repeat>
<output_collection name="output" type="list" count="0">
</output_collection>
Expand Down

0 comments on commit 4fd73fc

Please sign in to comment.