Skip to content

Stop generating controller-first URLs #981

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

Open
labkey-adam wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Stop generating controller-first URLs #981

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions flow/src/org/labkey/flow/view/FlowQueryView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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()))
Expand Down Expand Up @@ -393,11 +393,11 @@ public NavTrailConfig getNavTrailConfig()
List<NavTree> 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)
{
Expand Down