Rename flush in to_history_dataset_association to commit

galaxyproject · Oct 10, 2024 · 4bf029b · 4bf029b
1 parent 5e924cc
commit 4bf029b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
@@ -6049,7 +6049,7 @@ def __init__(
         self.user = user
 
     def to_history_dataset_association(
-        self, target_history, parent_id=None, add_to_history=False, visible=None, flush=True
+        self, target_history, parent_id=None, add_to_history=False, visible=None, commit=True
     ):
         sa_session = object_session(self)
         hda = HistoryDatasetAssociation(
@@ -6075,9 +6075,9 @@ def to_history_dataset_association(
         hda.metadata = self.metadata
         if add_to_history and target_history:
             target_history.stage_addition(hda)
-            if flush:
+            if commit:
                 target_history.add_pending_items()
-        if flush:
+        if commit:
             with transaction(sa_session):
                 sa_session.commit()
         return hda

diff --git a/lib/galaxy/webapps/galaxy/services/history_contents.py b/lib/galaxy/webapps/galaxy/services/history_contents.py
@@ -1174,7 +1174,7 @@ def traverse(folder):
 
             hdas = [
                 ld.library_dataset_dataset_association.to_history_dataset_association(
-                    history, add_to_history=True, flush=False
+                    history, add_to_history=True, commit=False
                 )
                 for ld in traverse(folder)
             ]