opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use a collection's history if trans has no history

Browse Source
This commit is contained in:
mvdbeek
2017-11-06 12:35:51 +01:00
parent f927ded864
commit 2faf8577ab
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/managers/collections.py
+3 -2
View File
@@ -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):