1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/c32b71dcfc84/ changeset: c32b71dcfc84 user: dan date: 2012-04-19 18:07:31 summary: Fix for clearing implicitly converted dataset association when converted dataset is deleted. affected #: 2 files diff -r 0b52c4f1bf4673ebbd762fe84d09c2edd1d798df -r c32b71dcfc84965dc6dacd80495b0b7bac3089cc lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -1125,7 +1125,7 @@ return ldda def clear_associated_files( self, metadata_safe = False, purge = False ): # metadata_safe = True means to only clear when assoc.metadata_safe == False - for assoc in self.implicitly_converted_datasets: + for assoc in self.implicitly_converted_datasets + self.implicitly_converted_parent_datasets: if not metadata_safe or not assoc.metadata_safe: assoc.clear( purge = purge ) def get_display_name( self ): diff -r 0b52c4f1bf4673ebbd762fe84d09c2edd1d798df -r c32b71dcfc84965dc6dacd80495b0b7bac3089cc lib/galaxy/model/mapping.py --- a/lib/galaxy/model/mapping.py +++ b/lib/galaxy/model/mapping.py @@ -1204,6 +1204,9 @@ implicitly_converted_datasets=relation( ImplicitlyConvertedDatasetAssociation, primaryjoin=( ImplicitlyConvertedDatasetAssociation.table.c.hda_parent_id == HistoryDatasetAssociation.table.c.id ) ), + implicitly_converted_parent_datasets=relation( + ImplicitlyConvertedDatasetAssociation, + primaryjoin=( ImplicitlyConvertedDatasetAssociation.table.c.hda_id == HistoryDatasetAssociation.table.c.id ) ), children=relation( HistoryDatasetAssociation, primaryjoin=( HistoryDatasetAssociation.table.c.parent_id == HistoryDatasetAssociation.table.c.id ), Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.