Skip to content

Commit 2b42427

Browse files
committed
Merge 25.7 to 25.11
Conflicts: flow/src/org/labkey/flow/data/FlowProtocol.java nab/src/org/labkey/nab/NabAssayController.java signalData/src/org/labkey/signaldata/SignalDataController.java signalData/src/org/labkey/signaldata/SignalDataModule.java
2 parents cb34964 + e8a4464 commit 2b42427

23 files changed

Lines changed: 1599 additions & 722 deletions

File tree

elisa/src/org/labkey/elisa/ElisaController.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.labkey.api.exp.property.Domain;
3333
import org.labkey.api.security.RequiresPermission;
3434
import org.labkey.api.security.permissions.ReadPermission;
35+
import org.labkey.api.view.NotFoundException;
3536
import org.labkey.elisa.actions.ElisaUploadWizardAction;
3637
import org.labkey.elisa.query.CurveFitDb;
3738
import org.labkey.elisa.query.ElisaManager;
@@ -109,10 +110,10 @@ public static class GetCurveFitXYPairs extends ReadOnlyApiAction<GetCurveFitXYPa
109110
@Override
110111
public void validateForm(GetCurveFitXYPairsForm form, Errors errors)
111112
{
112-
_run = ExperimentService.get().getExpRun(form.getRunId());
113+
// GitHub Kanban #1236: getExpRun() resolves by global rowId; ensure the run belongs to the current container
114+
_run = ExperimentService.get().getExpRun(form.getRunId(), getContainer());
113115
if (_run == null)
114-
errors.reject(ERROR_MSG, "Unable to find run for ID " + form.getRunId() + ".");
115-
116+
throw new NotFoundException("Run " + form.getRunId() + " does not exist.");
116117
if (form.getNumberOfPoints() < 2)
117118
errors.reject(ERROR_MSG, "At least 2 points must be requested.");
118119
if (form.getxMin() >= form.getxMax())

0 commit comments

Comments
 (0)