opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-11-02 19:52:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20895 from mvdbeek/add_ldda_purged

Browse Source 
[25.0] Add LDDA purged property
This commit is contained in:
John Davis
2025-09-11 12:27:40 -04:00
committed by GitHub
parent fb46c0a866 9dac51b62e
commit c47bb0c4f6
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/model/__init__.py
+5
View File
@@ -6282,6 +6282,11 @@ class LibraryDatasetDatasetAssociation(DatasetInstance, HasName, Serializable):
self.library_dataset = library_dataset
self.user = user
@property
def purged(self):
# For uniformity with HistoryDatasetAssociation
return self.dataset and self.dataset.purged
def to_history_dataset_association(
self, target_history, parent_id=None, add_to_history=False, visible=None, commit=True
):
lib/galaxy/model/store/__init__.py
+6 -2
View File
@@ -651,7 +651,9 @@ class ModelImportStore(metaclass=abc.ABCMeta):
if dataset_state == dataset_instance.states.DEFERRED:
dataset_instance.state = dataset_instance.states.DEFERRED
dataset_instance.deleted = False
dataset_instance.purged = False
if isinstance(dataset_instance, model.HistoryDatasetAssociation):
dataset_instance.purged = False
assert dataset_instance.dataset
dataset_instance.dataset.deleted = False
dataset_instance.dataset.purged = False
elif (
@@ -666,7 +668,9 @@ class ModelImportStore(metaclass=abc.ABCMeta):
dataset_instance.state = target_state
deleted = is_discarded and (discarded_data == ImportDiscardedDataType.FORBID)
dataset_instance.deleted = deleted
dataset_instance.purged = deleted
if isinstance(dataset_instance, model.HistoryDatasetAssociation):
dataset_instance.purged = deleted
assert dataset_instance.dataset
dataset_instance.dataset.state = target_state
dataset_instance.dataset.deleted = deleted
dataset_instance.dataset.purged = deleted