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

Merge pull request #14287 from mvdbeek/drop_dataset_error_controller_method 

[22.05] Drop dataset error controller method
parents 9de78164 457a6275

client/src/mvc/dataset/dataset-model.js

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ var DatasetAssociation = Backbone.Model.extend(BASE_MVC.LoggableMixin).extend( 
                    display: `datasets/${id}/display/?preview=True`,

                    edit: `datasets/edit?dataset_id=${id}`,

                    download: `api/datasets/${id}/display${this._downloadQueryParameters()}`,

                    report_error: `dataset/errors?id=${id}`,

                    report_error: `datasets/error?dataset_id=${id}`,

                    rerun: `tool_runner/rerun?id=${id}`,

                    show_params: `datasets/${id}/details`,

                    visualization: "visualization",

lib/galaxy/webapps/galaxy/controllers/dataset.py

+0 −11
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ from markupsafe import escape 


from galaxy import (

    datatypes,

    model,

    util,

    web,

)
@@ -88,16 +87,6 @@ class DatasetInterface(BaseUIController, UsesAnnotations, UsesItemRatings, UsesE 
            roles, dataset_association.dataset

        )



    @web.expose

    def errors(self, trans, id):

        hda = trans.sa_session.query(model.HistoryDatasetAssociation).get(self.decode_id(id))



        if not hda or not self._can_access_dataset(trans, hda):

            return trans.show_error_message(

                "Either this dataset does not exist or you do not have permission to access it."

            )

        return trans.fill_template("dataset/errors.mako", hda=hda)



    @web.expose

    def stdout(self, trans, dataset_id=None, **kwargs):

        trans.response.set_content_type("text/plain")