Unverified Commit d184979e authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #18547 from mvdbeek/fix_displayable_deleted_request 

[24.1] Also check dataset.deleted when determining if data can be displayed
parents 13871de7 52b868ed

lib/galaxy/datatypes/interval.py

+2 −1
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ class Interval(Tabular): 
    def displayable(self, dataset: DatasetProtocol) -> bool:

        try:

            return (

                not dataset.dataset.purged

                not dataset.deleted

                and not dataset.dataset.purged

                and dataset.has_data()

                and dataset.state == dataset.states.OK

                and dataset.metadata.columns > 0

lib/galaxy/datatypes/protocols.py

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ class HasCreatingJob(Protocol): 
    def creating_job(self): ...





class HasDeleted(Protocol):

    deleted: bool





class HasExt(Protocol):

    @property

    def ext(self): ...
@@ -55,6 +59,7 @@ class HasExtraFilesAndMetadata(HasExtraFilesPath, HasMetadata, Protocol): ... 


class DatasetProtocol(

    HasCreatingJob,

    HasDeleted,

    HasExt,

    HasExtraFilesPath,

    HasFileName,

lib/galaxy/datatypes/tabular.py

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ class TabularData(Text): 
    def displayable(self, dataset: DatasetProtocol) -> bool:

        try:

            return (

                not dataset.dataset.purged

                not dataset.deleted

                and not dataset.dataset.purged

                and dataset.has_data()

                and dataset.state == dataset.states.OK

                and dataset.metadata.columns > 0