From 555b6d745d245d5fa6d6868e92cc3797d6855343 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 15 Sep 2015 16:03:05 +0100 Subject: [PATCH] Fix for 13ea86753ad778aaaf6e6470a9370190fc2e91a0. Fixes tests and functionality broken with 13ea86753ad778aaaf6e6470a9370190fc2e91a0 as spotted by eagle eye @nsoranzo here https://github.com/galaxyproject/galaxy/commit/13ea86753ad778aaaf6e6470a9370190fc2e91a0#commitcomment-13245289. --- lib/galaxy/managers/collections.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/lib/galaxy/managers/collections.py b/lib/galaxy/managers/collections.py index 7313d9a4b8f..ded32d1ba84 100644 --- a/lib/galaxy/managers/collections.py +++ b/lib/galaxy/managers/collections.py @@ -61,7 +61,7 @@ class DatasetCollectionManager( object ): if element_identifiers and not trusted_identifiers: validate_input_element_identifiers( element_identifiers ) - dataset_collection = self.__create_dataset_collection( + dataset_collection = self.create_dataset_collection( trans=trans, collection_type=collection_type, element_identifiers=element_identifiers, @@ -107,18 +107,6 @@ class DatasetCollectionManager( object ): return self.__persist( dataset_collection_instance ) def create_dataset_collection( - self, - trans, - collection_type, - elements=None, - ): - return self.__create_dataset_collection( - trans=trans, - collection_type=collection_type, - elements=elements, - ) - - def __create_dataset_collection( self, trans, collection_type, @@ -253,7 +241,7 @@ class DatasetCollectionManager( object ): # element identifier is a dict with src new_collection... collection_type = element_identifier.get( "collection_type", None ) - collection = self.__create_dataset_collection( + collection = self.create_dataset_collection( trans=trans, collection_type=collection_type, element_identifiers=element_identifier[ "element_identifiers" ],