Skip to content

Triggers: support managing columns for data iteration #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-nicka wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Triggers: support managing columns for data iteration #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/org/labkey/targetedms/query/InstrumentScheduleOverlapTrigger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -20,7 +21,7 @@
public class InstrumentScheduleOverlapTrigger implements Trigger
{
@Override
public void beforeInsert(TableInfo table, Container c, User user, Map<String, Object> newRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
public void beforeInsert(TableInfo table, Container c, User user, @Nullable QueryUpdateService.InsertOption insertOption, Map<String, Object> newRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
{
validateNoOverlap(newRow, null);
Number instrument = (Number) newRow.get("Instrument");
Expand All @@ -32,7 +33,7 @@ public void beforeInsert(TableInfo table, Container c, User user, Map<String, Ob
}

@Override
public void beforeUpdate(TableInfo table, Container c, User user, @Nullable Map<String, Object> newRow, @Nullable Map<String, Object> oldRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
public void beforeUpdate(TableInfo table, Container c, User user, @Nullable QueryUpdateService.InsertOption insertOption, @Nullable Map<String, Object> newRow, @Nullable Map<String, Object> oldRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
{
// Use the Id from either newRow or oldRow to exclude the current record
Integer id = getId(newRow);
Expand Down
5 changes: 3 additions & 2 deletions src/org/labkey/targetedms/query/OwnProjectSchedulingTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -113,7 +114,7 @@ private Integer getInteger(@Nullable Map<String, Object> row, String key)


@Override
public void beforeInsert(TableInfo table, Container c, User user, @Nullable Map<String, Object> newRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
public void beforeInsert(TableInfo table, Container c, User user, @Nullable QueryUpdateService.InsertOption insertOption, @Nullable Map<String, Object> newRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
{
checkRowLevelPermission(newRow, true);
}
Expand Down Expand Up @@ -149,7 +150,7 @@ private void checkRowLevelPermission(@Nullable Map<String, Object> newRow, boole
}

@Override
public void beforeUpdate(TableInfo table, Container c, User user, @Nullable Map<String, Object> newRow, @Nullable Map<String, Object> oldRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
public void beforeUpdate(TableInfo table, Container c, User user, @Nullable QueryUpdateService.InsertOption insertOption, @Nullable Map<String, Object> newRow, @Nullable Map<String, Object> oldRow, ValidationException errors, Map<String, Object> extraContext) throws ValidationException
{
checkRowLevelPermission(oldRow, false);
checkRowLevelPermission(newRow, false);
Expand Down
Loading