From d6ff59ee0e0fe505ed1fe85933089b1e4e77741f Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 27 May 2014 09:06:44 -0500 Subject: [PATCH] Bugfix: Don't show deleted HDCAs when displaying tool selection options. --- lib/galaxy/dataset_collections/__init__.py | 2 +- lib/galaxy/tools/parameters/basic.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/dataset_collections/__init__.py b/lib/galaxy/dataset_collections/__init__.py index 31288d0dc11..6603969ae7e 100644 --- a/lib/galaxy/dataset_collections/__init__.py +++ b/lib/galaxy/dataset_collections/__init__.py @@ -170,7 +170,7 @@ class DatasetCollectionsService( return validated_payload def history_dataset_collections(self, history, query): - collections = history.dataset_collections + collections = history.active_dataset_collections collections = filter( query.direct_match, collections ) return collections diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py index 488a0753c4c..77715efa67c 100644 --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1738,7 +1738,7 @@ class DataToolParameter( BaseDataToolParameter ): dataset_collection_matcher = DatasetCollectionMatcher( dataset_matcher ) - for history_dataset_collection in history.dataset_collections: + for history_dataset_collection in history.active_dataset_collections: if dataset_collection_matcher.hdca_match( history_dataset_collection, reduction=reduction ): name = history_dataset_collection.name hid = str( history_dataset_collection.hid ) @@ -2042,7 +2042,7 @@ class DataCollectionToolParameter( BaseDataToolParameter ): dataset_matcher = DatasetMatcher( trans, self, value, other_values ) dataset_collection_matcher = DatasetCollectionMatcher( dataset_matcher ) - for history_dataset_collection in history.dataset_collections: + for history_dataset_collection in history.active_dataset_collections: if not self._history_query( trans ).can_map_over( history_dataset_collection ): continue