Skip to content

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

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

Merged
labkey-jeckels merged 2 commits into from
Mar 25, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7bb5d3
Issue 52614: AssertionError deleting site group from its details page
labkey-jeckels Mar 21, 2025
b7c727c
Switch to use Container for member variables too
labkey-jeckels Mar 24, 2025
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
4 changes: 2 additions & 2 deletions ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down
6 changes: 6 additions & 0 deletions ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalatorAuditProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions snd/src/org/labkey/snd/NarrativeAuditProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
}
Expand Down