From 808b394ca9b66728fd43ef996e98857e37330b15 Mon Sep 17 00:00:00 2001 From: labkey-nicka Date: Fri, 3 Apr 2026 14:52:42 -0700 Subject: [PATCH] Trigger interface changes --- .../targetedms/query/InstrumentScheduleOverlapTrigger.java | 5 +++-- .../labkey/targetedms/query/OwnProjectSchedulingTable.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/org/labkey/targetedms/query/InstrumentScheduleOverlapTrigger.java b/src/org/labkey/targetedms/query/InstrumentScheduleOverlapTrigger.java index becfe99d9..91bf252b0 100644 --- a/src/org/labkey/targetedms/query/InstrumentScheduleOverlapTrigger.java +++ b/src/org/labkey/targetedms/query/InstrumentScheduleOverlapTrigger.java @@ -6,6 +6,7 @@ import org.labkey.api.data.SqlSelector; import org.labkey.api.data.TableInfo; import org.labkey.api.data.triggers.Trigger; +import org.labkey.api.query.QueryUpdateService; import org.labkey.api.query.ValidationException; import org.labkey.api.security.User; import org.labkey.targetedms.TargetedMSManager; @@ -20,7 +21,7 @@ public class InstrumentScheduleOverlapTrigger implements Trigger { @Override - public void beforeInsert(TableInfo table, Container c, User user, Map newRow, ValidationException errors, Map extraContext) throws ValidationException + public void beforeInsert(TableInfo table, Container c, User user, @Nullable QueryUpdateService.InsertOption insertOption, Map newRow, ValidationException errors, Map extraContext) throws ValidationException { validateNoOverlap(newRow, null); Number instrument = (Number) newRow.get("Instrument"); @@ -32,7 +33,7 @@ public void beforeInsert(TableInfo table, Container c, User user, Map newRow, @Nullable Map oldRow, ValidationException errors, Map extraContext) throws ValidationException + public void beforeUpdate(TableInfo table, Container c, User user, @Nullable QueryUpdateService.InsertOption insertOption, @Nullable Map newRow, @Nullable Map oldRow, ValidationException errors, Map extraContext) throws ValidationException { // Use the Id from either newRow or oldRow to exclude the current record Integer id = getId(newRow); diff --git a/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java b/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java index 28ba0a57a..e9a88e7f8 100644 --- a/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java +++ b/src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java @@ -8,6 +8,7 @@ import org.labkey.api.data.SqlSelector; import org.labkey.api.data.TableInfo; import org.labkey.api.data.triggers.Trigger; +import org.labkey.api.query.QueryUpdateService; import org.labkey.api.query.ValidationException; import org.labkey.api.security.User; import org.labkey.api.security.UserPrincipal; @@ -113,7 +114,7 @@ private Integer getInteger(@Nullable Map row, String key) @Override - public void beforeInsert(TableInfo table, Container c, User user, @Nullable Map newRow, ValidationException errors, Map extraContext) throws ValidationException + public void beforeInsert(TableInfo table, Container c, User user, @Nullable QueryUpdateService.InsertOption insertOption, @Nullable Map newRow, ValidationException errors, Map extraContext) throws ValidationException { checkRowLevelPermission(newRow, true); } @@ -149,7 +150,7 @@ private void checkRowLevelPermission(@Nullable Map newRow, boole } @Override - public void beforeUpdate(TableInfo table, Container c, User user, @Nullable Map newRow, @Nullable Map oldRow, ValidationException errors, Map extraContext) throws ValidationException + public void beforeUpdate(TableInfo table, Container c, User user, @Nullable QueryUpdateService.InsertOption insertOption, @Nullable Map newRow, @Nullable Map oldRow, ValidationException errors, Map extraContext) throws ValidationException { checkRowLevelPermission(oldRow, false); checkRowLevelPermission(newRow, false);