Skip to content

Commit

Permalink
Merge 24.7 to develop
Browse files Browse the repository at this point in the history
  • Loading branch information
labkey-teamcity committed Oct 31, 2024
2 parents 31a2175 + 589e978 commit 4b50f30
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions ehr/src/org/labkey/ehr/EHRController.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
import org.labkey.api.settings.AppProps;
import org.labkey.api.study.DatasetTable;
import org.labkey.api.util.ExceptionUtil;
import org.labkey.api.util.HtmlString;
import org.labkey.api.util.HtmlStringBuilder;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.util.Path;
Expand Down Expand Up @@ -1679,7 +1678,7 @@ public Object execute(PopulateLookupsForm form, BindException errors) throws Exc
context = new DataIteratorContext(batchErrors);
context.setConfigParameters(configParameters);
context.setInsertOption(QueryUpdateService.InsertOption.REPLACE);
context.getAlternateKeys().add("reportname");
context.addAlternateKeys(Collections.singleton("reportname"));

loader = DataLoader.get().createLoader(_additionalReportsResource, true, null, TabLoader.TSV_FILE_TYPE);
AbstractQueryImportAction.importData(loader, table, updateService, context, auditEvent, getUser(), getContainer());
Expand Down

0 comments on commit 4b50f30

Please sign in to comment.