From 92a76e9fd4f8002e43ff52382df2dfae5d5b3f7e Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Tue, 10 Nov 2020 15:29:27 +0100 Subject: [PATCH] Produce a clean list of dataset instances if not datasets in collection --- lib/galaxy/model/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index e7663e0cc71..e9d336bbcf6 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -4141,7 +4141,7 @@ class DatasetCollection(Dictifiable, UsesAnnotations, RepresentById): depth_collection_type = depth_collection_type.split(":", 1)[1] select_from = select_from.outerjoin(hda, hda.c.id == de.c.hda_id) select_stmt = select([hda]).select_from(select_from).where(dc.c.id == self.id).distinct() - return db_session.query(HistoryDatasetAssociation).select_entity_from(select_stmt).all() + return db_session.query(HistoryDatasetAssociation).select_entity_from(select_stmt).filter(HistoryDatasetAssociation.id.isnot(None)).all() else: # Sessionless context instances = []