Skip to content

Commit

Permalink
Merge pull request #18640 from mvdbeek/fix_resume_error_no_current_hi…
Browse files Browse the repository at this point in the history
…story

[24.1] Fix resume_paused_jobs if no session provided
  • Loading branch information
mvdbeek authored Aug 5, 2024
2 parents 797d192 + 7746703 commit a74e519
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions lib/galaxy/webapps/galaxy/controllers/history.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,21 +237,17 @@ def purge_deleted_datasets(self, trans):
)
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.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
history = trans.get_history()
if history:
history.resume_paused_jobs()
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")
Expand Down

0 comments on commit a74e519

Please sign in to comment.