From 925dbb0f7718e673cc9dca859371d3a342c8b0e1 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Thu, 27 Feb 2025 11:17:26 -0800 Subject: [PATCH] Consolidate UserSchema.getPath() with getSchemaPath() --- elisa/src/org/labkey/elisa/ElisaAssayProvider.java | 2 +- .../microarray/controllers/FeatureAnnotationSetController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/elisa/src/org/labkey/elisa/ElisaAssayProvider.java b/elisa/src/org/labkey/elisa/ElisaAssayProvider.java index d62fc11d31..045ca06783 100644 --- a/elisa/src/org/labkey/elisa/ElisaAssayProvider.java +++ b/elisa/src/org/labkey/elisa/ElisaAssayProvider.java @@ -394,7 +394,7 @@ public ModelAndView createRunDetailsView(ViewContext context, ExpProtocol protoc ElisaController.RunDetailsForm form = new ElisaController.RunDetailsForm(); form.setProtocolId(protocol.getRowId()); - form.setSchemaName(schema.getPath().toString()); + form.setSchemaName(schema.getSchemaPath().toString()); form.setRunId(run.getRowId()); form.setRunName(run.getName()); diff --git a/microarray/src/org/labkey/microarray/controllers/FeatureAnnotationSetController.java b/microarray/src/org/labkey/microarray/controllers/FeatureAnnotationSetController.java index a4eddad355..80d3bf173f 100644 --- a/microarray/src/org/labkey/microarray/controllers/FeatureAnnotationSetController.java +++ b/microarray/src/org/labkey/microarray/controllers/FeatureAnnotationSetController.java @@ -299,7 +299,7 @@ public ModelAndView getView(FeatureAnnotationSetForm form, BindException errors) dr.addColumns(new ArrayList<>(columns.values())); ButtonBar bb = new ButtonBar(); - ActionURL editURL = QueryService.get().urlDefault(getContainer(), QueryAction.updateQueryRow, schema.getPath().toString(), featureAnnotationSetTable.getName()); + ActionURL editURL = QueryService.get().urlDefault(getContainer(), QueryAction.updateQueryRow, schema.getSchemaPath().toString(), featureAnnotationSetTable.getName()); editURL.addParameter("RowId", form.getRowId()); editURL.addReturnURL(getViewContext().getActionURL());