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

Merge pull request #18640 from mvdbeek/fix_resume_error_no_current_history

[24.1] Fix resume_paused_jobs if no session provided
parents 797d1926 77467031
Loading
Loading
Loading
Loading
+9 −13
Original line number Diff line number Diff line
@@ -237,21 +237,17 @@ class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesIt
            )
        return trans.show_error_message("Cannot purge deleted datasets from this session.")

    @web.expose
    @web.expose_api_anonymous
    def resume_paused_jobs(self, trans, current=False, ids=None, **kwargs):
        """Resume paused jobs the active history -- this does not require a logged in user."""
        """Resume paused jobs for the active history -- this does not require a logged in user."""
        if not ids and string_as_bool(current):
            histories = [trans.get_history()]
            refresh_frames = ["history"]
        else:
            raise NotImplementedError("You can currently only resume all the datasets of the current history.")
        for history in histories:
            history = trans.get_history()
            if history:
                history.resume_paused_jobs()
            trans.sa_session.add(history)
        with transaction(trans.sa_session):
            trans.sa_session.commit()
        return trans.show_ok_message("Your jobs have been resumed.", refresh_frames=refresh_frames)
        # TODO: used in index.mako
                return trans.show_ok_message("Your jobs have been resumed.")
        raise exceptions.RequestParameterInvalidException(
            "You can currently only resume all the datasets of the current history."
        )

    @web.expose_api
    @web.require_login("rename histories")