From d031907fb0d20ff3d09fd29cabaa31879feaec2d Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Wed, 18 Feb 2026 15:52:11 -0800 Subject: [PATCH] Stop generating controller-first URLs --- flow/src/org/labkey/flow/view/FlowQueryView.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flow/src/org/labkey/flow/view/FlowQueryView.java b/flow/src/org/labkey/flow/view/FlowQueryView.java index 73e6641d8..fb2d2795d 100644 --- a/flow/src/org/labkey/flow/view/FlowQueryView.java +++ b/flow/src/org/labkey/flow/view/FlowQueryView.java @@ -236,7 +236,7 @@ protected ActionButton createDeleteButton(boolean showConfirmation, boolean useE { // The Analysis "folder" table needs to use the getDeleteProtocolURL, the FCSRuns and FCSAnalysis 'views' need the getDeleteSelectedExpRunsURL if (useExpRunsURL) - setDeleteURL(ExperimentUrls.get().getDeleteSelectedExpRunsURL(getContainer(), getReturnUrl()).toContainerRelativeURL()); + setDeleteURL(ExperimentUrls.get().getDeleteSelectedExpRunsURL(getContainer(), getReturnUrl()).toRelativeURL()); return super.createDeleteButton(showConfirmation); } @@ -273,7 +273,7 @@ protected void populateButtonBar(DataView view, ButtonBar bar) super.populateButtonBar(view, bar); - // NOTE: Only add "Link to Study" to FCSAnlayses wells. This isn't a reliable way to check if the wells are FCSAnalysis wells. + // NOTE: Only add "Link to Study" to FCSAnalyses wells. This isn't a reliable way to check if the wells are FCSAnalysis wells. StudyPublishService aps = StudyPublishService.get(); String queryName = getSettings().getQueryName(); if (null != aps && queryName.equals(FlowTableType.FCSAnalyses.toString())) @@ -393,11 +393,11 @@ public NavTrailConfig getNavTrailConfig() List children = new ArrayList<>(); if (getContainer().getFolderType() instanceof FlowFolderType) { - children.add(0, new NavTree("Flow Dashboard", PageFlowUtil.urlProvider(ProjectUrls.class).getStartURL(getContainer()))); + children.addFirst(new NavTree("Flow Dashboard", PageFlowUtil.urlProvider(ProjectUrls.class).getStartURL(getContainer()))); } else { - children.add(0, new NavTree(FlowModule.getShortProductName(), new ActionURL(FlowController.BeginAction.class, getContainer()))); + children.addFirst(new NavTree(FlowModule.getShortProductName(), new ActionURL(FlowController.BeginAction.class, getContainer()))); } if (run != null) {