Issue 52614: AssertionError deleting site group from its details page (#919)

* Issue 52614: AssertionError deleting site group from its details page

* Switch to use Container for member variables too

Author: labkey-jeckels

ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalator.java

@@ -65,8 +65,8 @@ protected ThreadLocal<Integer> 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);
     }
 
     /**

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;

snd/src/org/labkey/snd/NarrativeAuditProvider.java

@@ -95,7 +95,7 @@ public <K extends AuditTypeEvent> Class<K> 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);
         }