opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-30 18:13:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Don't show deleted HDCAs when displaying tool selection options.

Browse Source
This commit is contained in:
John Chilton
2014-05-27 09:06:44 -05:00
parent fc8ee54ce2
commit d6ff59ee0e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/dataset_collections/__init__.py
+1 -1
View File
@@ -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
lib/galaxy/tools/parameters/basic.py
+2 -2
View File
@@ -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