From 91755b5881d3dce4eaaa3a982e0845e4c68f3d0e Mon Sep 17 00:00:00 2001 From: John Davis Date: Fri, 27 Jan 2023 18:24:13 -0500 Subject: [PATCH] Wrap session.flush in webapps.galaxy.controllers.forms --- lib/galaxy/webapps/galaxy/controllers/forms.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/controllers/forms.py b/lib/galaxy/webapps/galaxy/controllers/forms.py index 8134ffe4b0a..7f1cf44797f 100644 --- a/lib/galaxy/webapps/galaxy/controllers/forms.py +++ b/lib/galaxy/webapps/galaxy/controllers/forms.py @@ -9,6 +9,7 @@ from galaxy import ( model, util, ) +from galaxy.model.base import transaction from galaxy.web.framework.helpers import ( grids, iff, @@ -298,7 +299,8 @@ class Forms(BaseUIController): form_definition.form_definition_current = form_definition_current form_definition_current.latest_form = form_definition trans.sa_session.add(form_definition_current) - trans.sa_session.flush() + with transaction(trans.sa_session): + trans.sa_session.commit() return form_definition, None @web.expose @@ -308,7 +310,8 @@ class Forms(BaseUIController): form = get_form(trans, form_id) form.deleted = True trans.sa_session.add(form) - trans.sa_session.flush() + with transaction(trans.sa_session): + trans.sa_session.commit() return ("Deleted %i form(s)." % len(ids), "done") @web.expose @@ -318,7 +321,8 @@ class Forms(BaseUIController): form = get_form(trans, form_id) form.deleted = False trans.sa_session.add(form) - trans.sa_session.flush() + with transaction(trans.sa_session): + trans.sa_session.commit() return ("Undeleted %i form(s)." % len(ids), "done")