Skip to content

Issue 52098: Switch lookupByAlternateKey to enum #960

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-susanh merged 5 commits into from
May 26, 2025
Merged

Issue 52098: Switch lookupByAlternateKey to enum #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6039a2d
Issue 52098: Switch lookupByAlternateKey to enum with three choices
labkey-susanh Apr 9, 2025
76e4ebb
Issue 52098: Switch lookupByAlternateKey to enum with three choices
labkey-susanh Apr 9, 2025
e82eae6
Merge branch 'fb_lookupResolutionType' of https://github.com/LabKey/e…
labkey-susanh Apr 14, 2025
6a12a2a
Merge remote-tracking branch 'origin/develop' into fb_lookupResolutio…
labkey-susanh May 20, 2025
0380fbb
Merge remote-tracking branch 'origin/develop' into fb_lookupResolutio…
labkey-susanh May 21, 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
2 changes: 1 addition & 1 deletion ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ private void importFile(TsvImport tsvImport, Container container, User user) thr
auditEvent = createTransactionAuditEvent(container, QueryService.AuditAction.INSERT);

AbstractQueryImportAction.importData(loader, table, updateService, QueryUpdateService.InsertOption.INSERT,
new HashMap<>(), errors, behaviorType, auditEvent, null, user, container, null);
new HashMap<>(), null, errors, behaviorType, auditEvent, null, user, container, null);
}

private static class TsvImport
Expand Down
2 changes: 1 addition & 1 deletion ehr/src/org/labkey/ehr/EHRController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,7 +1493,7 @@ private void loadFile(UserSchema schema, String tableName, Resource resource, bo
auditEvent = createTransactionAuditEvent(getContainer(), QueryService.AuditAction.INSERT);

AbstractQueryImportAction.importData(loader, table, updateService, QueryUpdateService.InsertOption.INSERT,
new HashMap<>(), batchErrors, behaviorType, auditEvent, null, getUser(), getContainer(), null);
new HashMap<>(), null, batchErrors, behaviorType, auditEvent, null, getUser(), getContainer(), null);

if (batchErrors.hasErrors())
{
Expand Down