Unverified Commit c47bb0c4 authored by John Davis's avatar John Davis Committed by GitHub
Browse files

Merge pull request #20895 from mvdbeek/add_ldda_purged 

[25.0] Add LDDA purged property
parents fb46c0a8 9dac51b6

lib/galaxy/model/__init__.py

+5 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

                        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

                        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