From cd95635197eddaeee55be88f96543dc3a97e9343 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Wed, 20 Jan 2016 13:26:08 +0000 Subject: [PATCH] Fix #1538. Displaying subcollection mapping in tool forms was broken with #1308 - this fixes that I believe. --- lib/galaxy/tools/parameters/basic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py index 4a0f398b3c2..ddc5979dca3 100644 --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -2331,7 +2331,7 @@ class DataCollectionToolParameter( BaseDataToolParameter ): name = history_dataset_collection.name hid = str( history_dataset_collection.hid ) hidden_text = "" # TODO - subcollection_type = self._history_query( trans ).collection_type_description.collection_type + subcollection_type = self._history_query( trans ).can_map_over( history_dataset_collection ).collection_type id = "%s|%s" % ( dataset_matcher.trans.security.encode_id( history_dataset_collection.id ), subcollection_type ) text = "%s:%s %s" % ( hid, hidden_text, name ) @@ -2446,7 +2446,7 @@ class DataCollectionToolParameter( BaseDataToolParameter ): # append matching subcollections for hdca in self.match_multirun_collections( trans, history, dataset_matcher ): - subcollection_type = self._history_query( trans ).collection_type_description.collection_type + subcollection_type = self._history_query( trans ).can_map_over( hdca ).collection_type d['options']['hdca'].append({ 'id': trans.security.encode_id( hdca.id ), 'hid': hdca.hid,