From 2faf8577abb1098a15c72a733626ffbf3d74a142 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Mon, 6 Nov 2017 12:28:56 +0100 Subject: [PATCH] Use a collection's history if trans has no history --- lib/galaxy/managers/collections.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/managers/collections.py b/lib/galaxy/managers/collections.py index 04e8a14d956..bad27f02e93 100644 --- a/lib/galaxy/managers/collections.py +++ b/lib/galaxy/managers/collections.py @@ -333,10 +333,11 @@ class DatasetCollectionManager(object): def __get_history_collection_instance(self, trans, id, check_ownership=False, check_accessible=True): instance_id = int(trans.app.security.decode_id(id)) collection_instance = trans.sa_session.query(trans.app.model.HistoryDatasetCollectionAssociation).get(instance_id) + history = getattr(trans, 'history', collection_instance.history) if check_ownership: - self.history_manager.error_unless_owner(collection_instance.history, trans.user, current_history=trans.history) + self.history_manager.error_unless_owner(collection_instance.history, trans.user, current_history=history) if check_accessible: - self.history_manager.error_unless_accessible(collection_instance.history, trans.user, current_history=trans.history) + self.history_manager.error_unless_accessible(collection_instance.history, trans.user, current_history=history) return collection_instance def __get_library_collection_instance(self, trans, id, check_ownership=False, check_accessible=True):