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

Merge pull request #18307 from mvdbeek/do_not_show_display_application_links_for_deleted_datasets 

[24.0] Don't serialize display application links for deleted datasets
parents 132ea2b1 91610ddb

lib/galaxy/managers/hdas.py

+35 −32
Original line number Diff line number Diff line
@@ -617,6 +617,7 @@ class HDASerializer( # datasets._UnflattenedMetadataDatasetAssociationSerialize 
        """

        hda = item

        display_apps: List[Dict[str, Any]] = []

        if hda.state == model.HistoryDatasetAssociation.states.OK and not hda.deleted:

            for display_app in hda.get_display_applications(trans).values():

                app_links = []

                for link_app in display_app.links.values():
@@ -638,9 +639,11 @@ class HDASerializer( # datasets._UnflattenedMetadataDatasetAssociationSerialize 
        """

        hda = item

        display_apps: List[Dict[str, Any]] = []

        if not self.app.config.enable_old_display_applications:

            return display_apps



        if (

            self.app.config.enable_old_display_applications

            and hda.state == model.HistoryDatasetAssociation.states.OK

            and not hda.deleted

        ):

            display_link_fn = hda.datatype.get_display_links

            for display_app in hda.datatype.get_display_types():

                target_frame, display_links = display_link_fn(