From c7bb5d3dccc1ddf88d6139297180792e206e9379 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Fri, 21 Mar 2025 14:07:45 -0700 Subject: [PATCH 1/2] Issue 52614: AssertionError deleting site group from its details page --- snd/src/org/labkey/snd/NarrativeAuditProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snd/src/org/labkey/snd/NarrativeAuditProvider.java b/snd/src/org/labkey/snd/NarrativeAuditProvider.java index 0e363733b..17643cd4b 100644 --- a/snd/src/org/labkey/snd/NarrativeAuditProvider.java +++ b/snd/src/org/labkey/snd/NarrativeAuditProvider.java @@ -95,7 +95,7 @@ public Class getEventClass() public static void addAuditEntry(Container container, User user, Integer eventId, String subjectId, Date eventDate, String narrative, Integer qcState, String comment) { - NarrativeAuditProvider.NarrativeAuditTypeEvent event = new NarrativeAuditProvider.NarrativeAuditTypeEvent(container.getId(), comment); + NarrativeAuditProvider.NarrativeAuditTypeEvent event = new NarrativeAuditProvider.NarrativeAuditTypeEvent(container, comment); event.setNarrative(narrative); event.setEventId(eventId); event.setSubjectId(subjectId); @@ -118,7 +118,7 @@ public NarrativeAuditTypeEvent() super(); } - public NarrativeAuditTypeEvent(String container, String comment) + public NarrativeAuditTypeEvent(Container container, String comment) { super(NARRATIVE_AUDIT_EVENT, container, comment); } From b7c727ce99b6c18a739338b5bf8afb2fb6e0683e Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Mon, 24 Mar 2025 14:57:31 -0700 Subject: [PATCH 2/2] Switch to use Container for member variables too --- .../org/labkey/api/ehr/security/EHRSecurityEscalator.java | 4 ++-- .../api/ehr/security/EHRSecurityEscalatorAuditProvider.java | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalator.java b/ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalator.java index 56226ede9..512e77bec 100644 --- a/ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalator.java +++ b/ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalator.java @@ -65,8 +65,8 @@ protected ThreadLocal getEscalationLevelTracker() { * @return A blank new {@link SecurityEscalationAuditProvider.SecurityEscalationEvent}. */ @Override - protected SecurityEscalationAuditProvider.SecurityEscalationEvent getNewSecurityEvent() { - return new EHRSecurityEscalatorAuditProvider.EHRSecurityEscalationEvent(); + protected SecurityEscalationAuditProvider.SecurityEscalationEvent getNewSecurityEvent(Container container, String comment) { + return new EHRSecurityEscalatorAuditProvider.EHRSecurityEscalationEvent(container, comment); } /** diff --git a/ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalatorAuditProvider.java b/ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalatorAuditProvider.java index 802184140..c3629d3b4 100644 --- a/ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalatorAuditProvider.java +++ b/ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalatorAuditProvider.java @@ -16,6 +16,7 @@ package org.labkey.api.ehr.security; import org.labkey.api.audit.query.AbstractAuditDomainKind; +import org.labkey.api.data.Container; import org.labkey.api.study.security.SecurityEscalationAuditProvider; /** @@ -53,6 +54,11 @@ protected AbstractAuditDomainKind getDomainKind() { public static class EHRSecurityEscalationEvent extends SecurityEscalationEvent { + public EHRSecurityEscalationEvent(Container container, String comment) + { + super(EVENT_TYPE, container, comment); + } + @Override public String getEventType() { return EVENT_TYPE;