From a68ec955e0781acc4047fa9bb414c89a646466fb Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 12 Aug 2026 14:46:15 -0700 Subject: [PATCH] Pass through optional auditUserComment to beforeMaterialDelete and beforeDataDelete methods --- flow/src/org/labkey/flow/FlowExperimentListener.java | 3 ++- .../microarray/matrix/ExpressionMatrixExperimentListener.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/flow/src/org/labkey/flow/FlowExperimentListener.java b/flow/src/org/labkey/flow/FlowExperimentListener.java index 04a2624b92..48c6c75ff1 100644 --- a/flow/src/org/labkey/flow/FlowExperimentListener.java +++ b/flow/src/org/labkey/flow/FlowExperimentListener.java @@ -15,6 +15,7 @@ */ package org.labkey.flow; +import org.jetbrains.annotations.Nullable; import org.labkey.api.data.Container; import org.labkey.api.data.DbScope; import org.labkey.api.exp.api.ExpMaterial; @@ -28,7 +29,7 @@ public class FlowExperimentListener implements ExperimentListener { @Override - public void beforeMaterialDelete(List materials, Container container, User user) + public void beforeMaterialDelete(List materials, Container container, User user, @Nullable String auditUserComment) { DbScope.Transaction tx = ExperimentService.get().getSchema().getScope().getCurrentTransaction(); tx.addCommitTask(() -> FlowManager.get().flowObjectModified(), DbScope.CommitTaskOption.POSTCOMMIT); diff --git a/microarray/src/org/labkey/microarray/matrix/ExpressionMatrixExperimentListener.java b/microarray/src/org/labkey/microarray/matrix/ExpressionMatrixExperimentListener.java index 3669856009..de72df3fe2 100644 --- a/microarray/src/org/labkey/microarray/matrix/ExpressionMatrixExperimentListener.java +++ b/microarray/src/org/labkey/microarray/matrix/ExpressionMatrixExperimentListener.java @@ -15,6 +15,7 @@ */ package org.labkey.microarray.matrix; +import org.jetbrains.annotations.Nullable; import org.labkey.api.data.Container; import org.labkey.api.data.SQLFragment; import org.labkey.api.data.SqlExecutor; @@ -35,7 +36,7 @@ public class ExpressionMatrixExperimentListener implements ExperimentListener { @Override - public void beforeMaterialDelete(List materials, Container container, User user) + public void beforeMaterialDelete(List materials, Container container, User user, @Nullable String auditUserComment) { SqlDialect d = MicroarrayUserSchema.getSchema().getSqlDialect(); SqlExecutor sqlExecutor = new SqlExecutor(MicroarrayUserSchema.getSchema());