Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions flow/src/org/labkey/flow/controllers/ReportsController.java
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ public ActionURL getSuccessURL(CopyForm idForm)
{
ActionURL url = new ActionURL(UpdateAction.class, getContainer()).addParameter("reportId", r.getReportId().toString());
if (idForm.getReturnActionURL() != null)
url.addReturnURL(idForm.getReturnActionURL());
url.addReturnUrl(idForm.getReturnActionURL());
return url;
}

Expand Down Expand Up @@ -346,7 +346,7 @@ public void validateCommand(IdForm idForm, Errors errors)
@Override
public URLHelper getCancelUrl()
{
return _form.getReturnURLHelper(new ActionURL(BeginAction.class, getContainer()));
return _form.getReturnUrlHelper(new ActionURL(BeginAction.class, getContainer()));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
AttributeCache.Entry entry = form.getEntry(getContainer());

ActionURL editURL = getActionURL();
ActionURL returnURL = form.getReturnActionURL(new ActionURL(ProtocolController.BeginAction.class, getContainer()));
ActionURL returnUrl = form.getReturnActionURL(new ActionURL(ProtocolController.BeginAction.class, getContainer()));
%>

Create alias for <%=h(entry.getType().name())%>: <%=h(entry.getName())%>
Expand All @@ -49,7 +49,7 @@ Create alias for <%=h(entry.getType().name())%>: <%=h(entry.getName())%>
<td>&nbsp;</td>
<td>
<%= button("Submit").submit(true) %>
<%= button("Cancel").href(returnURL) %>
<%= button("Cancel").href(returnUrl) %>
</td>
</tr>
</table>
Expand Down
8 changes: 4 additions & 4 deletions flow/src/org/labkey/flow/controllers/attribute/edit.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@
if (StringUtils.isEmpty(name))
name = entry.getName();

ActionURL editURL = getActionURL();
ActionURL returnURL = form.getReturnActionURL(new ActionURL(ProtocolController.BeginAction.class, getContainer()));
ActionURL editUrl = getActionURL();
ActionURL returnUrl = form.getReturnActionURL(new ActionURL(ProtocolController.BeginAction.class, getContainer()));
%>

Change the name of the <%=h(entry.getType().name())%> or clear the name to delete it.
<br>

<labkey:errors/>
<labkey:form action="<%=editURL%>" method="post">
<labkey:form action="<%=editUrl%>" method="post">
<table>
<tr>
<td>
Expand All @@ -51,7 +51,7 @@ Change the name of the <%=h(entry.getType().name())%> or clear the name to delet
<td>&nbsp;</td>
<td>
<%= button("Submit").submit(true) %>
<%= button("Cancel").href(returnURL) %>
<%= button("Cancel").href(returnUrl) %>
</td>
</tr>
</table>
Expand Down
6 changes: 3 additions & 3 deletions flow/src/org/labkey/flow/controllers/attribute/summary.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
Map<FlowEntry, Collection<FlowEntry>> aliasMap = FlowManager.get().getAliases(getContainer(), type);
ActionURL summaryURL = getActionURL();

ActionURL editURL = new ActionURL(AttributeController.EditAction.class, getContainer()).addParameter(AttributeController.Param.type, type.name()).addReturnURL(summaryURL);
ActionURL detailsURL = new ActionURL(AttributeController.DetailsAction.class, getContainer()).addParameter(AttributeController.Param.type, type.name()).addReturnURL(summaryURL);
ActionURL aliasURL = new ActionURL(AttributeController.CreateAliasAction.class, getContainer()).addParameter(AttributeController.Param.type, type.name()).addReturnURL(summaryURL);
ActionURL editURL = new ActionURL(AttributeController.EditAction.class, getContainer()).addParameter(AttributeController.Param.type, type.name()).addReturnUrl(summaryURL);
ActionURL detailsURL = new ActionURL(AttributeController.DetailsAction.class, getContainer()).addParameter(AttributeController.Param.type, type.name()).addReturnUrl(summaryURL);
ActionURL aliasURL = new ActionURL(AttributeController.CreateAliasAction.class, getContainer()).addParameter(AttributeController.Param.type, type.name()).addReturnUrl(summaryURL);
%>

<table>
Expand Down
2 changes: 1 addition & 1 deletion flow/src/org/labkey/flow/controllers/copyReport.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

ActionURL copyURL = new ActionURL(ReportsController.CopyAction.class, c).addParameter("reportId", report.getReportId().toString());
if (form.getReturnUrl() != null)
copyURL.addReturnURL(form.getReturnActionURL());
copyURL.addReturnUrl(form.getReturnActionURL());
%>
<labkey:errors/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ protected ModelAndView uploadRuns(ImportRunsForm form, BindException errors) thr
{
if (!form.isConfirm())
{
URLHelper url = form.getReturnURLHelper();
URLHelper url = form.getReturnUrlHelper();
if (url == null)
url = new ActionURL(BeginAction.class, getContainer());
return HttpView.redirect(url);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@

<br />
<%=button("Import Selected Runs").submit(true)%>
<labkey:button text="Cancel" href="<%=form.getReturnURLHelper()%>"/>
<labkey:button text="Cancel" href="<%=form.getReturnUrlHelper()%>"/>
</labkey:form><%
}
else
{
%><labkey:button text="Browse for more runs" href="<%=form.getReturnURLHelper()%>"/><%
%><labkey:button text="Browse for more runs" href="<%=form.getReturnUrlHelper()%>"/><%
}

%>
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

ActionURL submitURL = form.getProtocol().urlFor(ProtocolController.EditICSMetadataAction.class);
if (form.getReturnActionURL() != null)
submitURL.addReturnURL(form.getReturnActionURL());
submitURL.addReturnUrl(form.getReturnActionURL());
%>
<labkey:errors />
<labkey:form action="<%=submitURL%>" method="POST">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
</p>
<p><b>Manage Names and Aliases</b><br>
Create and remove names and aliases for Keywords, Statistics, and Graphs.<br>
<%=link("Case sensitivity").href(protocol.urlFor(AttributeController.CaseSensitivityAction.class).addReturnURL(getActionURL()))%><br/>
<%=link("Delete Unused").href(protocol.urlFor(AttributeController.DeleteUnusedAction.class).addReturnURL(getActionURL()))%><br/>
<%=link("Case sensitivity").href(protocol.urlFor(AttributeController.CaseSensitivityAction.class).addReturnUrl(getActionURL()))%><br/>
<%=link("Delete Unused").href(protocol.urlFor(AttributeController.DeleteUnusedAction.class).addReturnUrl(getActionURL()))%><br/>
<%=link("Manage Keywords").href(protocol.urlFor(AttributeController.SummaryAction.class).addParameter(AttributeController.Param.type, AttributeType.keyword.name()))%><br/>
<%=link("Manage Statistics").href(protocol.urlFor(AttributeController.SummaryAction.class).addParameter(AttributeController.Param.type, AttributeType.statistic.name()))%><br/>
<%=link("Manage Graphs").href(protocol.urlFor(AttributeController.SummaryAction.class).addParameter(AttributeController.Param.type, AttributeType.graph.name()))%><br/>
Expand Down
6 changes: 3 additions & 3 deletions flow/src/org/labkey/flow/controllers/reports.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
boolean canEdit = c.hasPermission(user, UpdatePermission.class);

ActionURL currentURL = getActionURL();
ActionURL copyURL = new ActionURL(ReportsController.CopyAction.class, c).addReturnURL(currentURL);
ActionURL deleteURL = new ActionURL(ReportsController.DeleteAction.class, c).addReturnURL(currentURL);
ActionURL copyURL = new ActionURL(ReportsController.CopyAction.class, c).addReturnUrl(currentURL);
ActionURL deleteURL = new ActionURL(ReportsController.DeleteAction.class, c).addReturnUrl(currentURL);

Collection<FlowReport> reports = FlowReportManager.getFlowReports(c, user);
Map<String, List<FlowReport>> reportsByType = new TreeMap<>();
Expand Down Expand Up @@ -96,7 +96,7 @@ table.reports td {
navtree.addChild("Edit", editURL);
navtree.addChild("Copy", copyURL);
navtree.addChild("Delete", deleteURL);
navtree.addChild("Execute", r.getRunReportURL(context).addParameter("confirm", true).addReturnURL(currentURL));
navtree.addChild("Execute", r.getRunReportURL(context).addParameter("confirm", true).addReturnUrl(currentURL));
PopupMenu menu = new PopupMenu(navtree, PopupMenu.Align.LEFT, PopupMenu.ButtonStyle.TEXT);
%><td><% menu.render(out); %></td>
<%}%>
Expand Down
10 changes: 5 additions & 5 deletions flow/src/org/labkey/flow/reports/ControlsQCReport.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ public class ControlsQCReport extends FilterFlowReport
public static String DESC = "Flow Controls Statistics over Time";
public static final String STATISTIC_PROP = "statistic";

public static ActionURL createURL(Container c, @Nullable ActionURL returnURL, @Nullable ActionURL cancelURL)
public static ActionURL createURL(Container c, @Nullable ActionURL returnUrl, @Nullable ActionURL cancelURL)
{
ActionURL url = new ActionURL(ReportsController.CreateAction.class, c).addParameter(ReportDescriptor.Prop.reportType, TYPE);
if (returnURL != null)
url.addReturnURL(returnURL);
if (returnUrl != null)
url.addReturnUrl(returnUrl);
if (cancelURL != null)
url.addCancelURL(cancelURL);
return url;
Expand All @@ -70,9 +70,9 @@ String getScriptResource() throws IOException
}

@Override
public HttpView getConfigureForm(ViewContext context, ActionURL returnURL, ActionURL cancelURL)
public HttpView<?> getConfigureForm(ViewContext context, ActionURL returnUrl, ActionURL cancelUrl)
{
return new JspView<>("/org/labkey/flow/reports/editQCReport.jsp", Tuple3.of(this, returnURL, cancelURL));
return new JspView<>("/org/labkey/flow/reports/editQCReport.jsp", Tuple3.of(this, returnUrl, cancelUrl));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion flow/src/org/labkey/flow/reports/FlowReport.java
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ String getScriptResource(String file) throws IOException
}
}

public abstract HttpView getConfigureForm(ViewContext context, ActionURL returnURL, ActionURL cancelURL);
public abstract HttpView<?> getConfigureForm(ViewContext context, ActionURL returnUrl, ActionURL cancelUrl);

/** override=true means only set parameters overrideable via the URL on execute */
public abstract boolean updateProperties(ContainerUser cu, PropertyValues pvs, BindException errors, boolean override);
Expand Down
16 changes: 8 additions & 8 deletions flow/src/org/labkey/flow/reports/PositivityFlowReport.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ public class PositivityFlowReport extends FilterFlowReport
public static final String DESC = "Flow Positivity Call";
public static final String SUBSET_PROP = "subset";

public static ActionURL createURL(Container c, @Nullable ActionURL returnURL, @Nullable ActionURL cancelURL)
public static ActionURL createURL(Container c, @Nullable ActionURL returnUrl, @Nullable ActionURL cancelUrl)
{
ActionURL url = new ActionURL(ReportsController.CreateAction.class, c).addParameter(ReportDescriptor.Prop.reportType, TYPE);
if (returnURL != null)
url.addReturnURL(returnURL);
if (cancelURL != null)
url.addCancelURL(cancelURL);
if (returnUrl != null)
url.addReturnUrl(returnUrl);
if (cancelUrl != null)
url.addCancelURL(cancelUrl);
return url;
}

Expand All @@ -91,9 +91,9 @@ String getScriptResource() throws IOException
}

@Override
public HttpView getConfigureForm(ViewContext context, ActionURL returnURL, ActionURL cancelURL)
public HttpView<?> getConfigureForm(ViewContext context, ActionURL returnUrl, ActionURL cancelUrl)
{
return new JspView<>("/org/labkey/flow/reports/editPositivityReport.jsp", Tuple3.of(this, returnURL, cancelURL));
return new JspView<>("/org/labkey/flow/reports/editPositivityReport.jsp", Tuple3.of(this, returnUrl, cancelUrl));
}

SubsetSpec getSubset()
Expand Down Expand Up @@ -174,7 +174,7 @@ public HttpView renderReport(ViewContext context) throws Exception
FlowProtocol protocol = FlowProtocol.getForContainer(context.getContainer());
ActionURL currentURL = context.getActionURL();
ActionURL editICSMetadataURL = protocol.urlFor(ProtocolController.EditICSMetadataAction.class);
editICSMetadataURL.addReturnURL(currentURL);
editICSMetadataURL.addReturnUrl(currentURL);

return HtmlView.unsafe(
"<p class='labkey-error'>Positivity report requires configuring flow experiment metadata for study and background information before running.</p>" +
Expand Down
18 changes: 9 additions & 9 deletions flow/src/org/labkey/flow/reports/editPositivityReport.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@

Tuple3<PositivityFlowReport, ActionURL, ActionURL> bean = (Tuple3<PositivityFlowReport, ActionURL, ActionURL>) HttpView.currentModel();
PositivityFlowReport report = bean.first;
ActionURL returnURL = bean.second;
ActionURL cancelURL = bean.third;
ActionURL returnUrl = bean.second;
ActionURL cancelUrl = bean.third;
ReportDescriptor d = report.getDescriptor();
String reportId = d.getReportId() == null ? null : d.getReportId().toString();

ActionURL retURL = returnURL == null ? urlFor(BeginAction.class) : returnURL;
ActionURL canURL = cancelURL == null ? retURL : cancelURL;
ActionURL retURL = returnUrl == null ? urlFor(BeginAction.class) : returnUrl;
ActionURL canURL = cancelUrl == null ? retURL : cancelUrl;

FlowProtocol protocol = FlowProtocol.getForContainer(c);
ICSMetadata metadata = protocol == null ? null : protocol.getICSMetadata();
Expand All @@ -61,7 +61,7 @@
if (protocol != null)
{
editICSMetadataURL = protocol.urlFor(EditICSMetadataAction.class);
editICSMetadataURL.addReturnURL(currentURL);
editICSMetadataURL.addReturnUrl(currentURL);
}
%>

Expand Down Expand Up @@ -142,12 +142,12 @@ function Form_onDelete()
if (d.getReportId() != null)
{
url = urlFor(DeleteAction.class).addParameter("reportId", report.getReportId().toString());
if (returnURL != null)
url.addReturnURL(returnURL);
if (returnUrl != null)
url.addReturnUrl(returnUrl);
}
else if (returnURL != null)
else if (returnUrl != null)
{
url = returnURL;
url = returnUrl;
}
else
{
Expand Down
16 changes: 8 additions & 8 deletions flow/src/org/labkey/flow/reports/editQCReport.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
<%
Tuple3<FilterFlowReport, ActionURL, ActionURL> bean = (Tuple3<FilterFlowReport, ActionURL, ActionURL>) HttpView.currentModel();
FilterFlowReport report = bean.first;
ActionURL returnURL = bean.second;
ActionURL cancelURL = bean.third;
ActionURL returnUrl = bean.second;
ActionURL cancelUrl = bean.third;
ReportDescriptor d = report.getDescriptor();
String reportId = d.getReportId() == null ? null : d.getReportId().toString();

ActionURL retURL = returnURL == null ? urlFor(BeginAction.class) : returnURL;
ActionURL canURL = cancelURL == null ? retURL : cancelURL;
ActionURL retURL = returnUrl == null ? urlFor(BeginAction.class) : returnUrl;
ActionURL canURL = cancelUrl == null ? retURL : cancelUrl;
%>
<style type="text/css">
.x-form-item {
Expand Down Expand Up @@ -113,12 +113,12 @@ function Form_onDelete()
if (d.getReportId() != null)
{
url = urlFor(DeleteAction.class).addParameter("reportId", report.getReportId().toString());
if (returnURL != null)
url.addReturnURL(returnURL);
if (returnUrl != null)
url.addReturnUrl(returnUrl);
}
else if (returnURL != null)
else if (returnUrl != null)
{
url = returnURL;
url = returnUrl;
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion flow/src/org/labkey/flow/script/FlowPipelineProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public boolean accept(File dir)

String path = directory.getPathParameter();
ActionURL returnUrl = PageFlowUtil.urlProvider(PipelineUrls.class).urlBrowse(context.getContainer(), null, path.toString());
importRunsURL.addReturnURL(returnUrl);
importRunsURL.addReturnUrl(returnUrl);
importRunsURL.replaceParameter("path", path);
String baseId = this.getClass().getName();

Expand Down
14 changes: 7 additions & 7 deletions flow/src/org/labkey/flow/view/FlowQueryView.java
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ protected void renderView(Object model, HttpServletRequest request, HttpServletR

if (showGraphs == FlowQuerySettings.ShowGraphs.Inline)
{
JspView view = new SetGraphSizeView();
SetGraphSizeView view = new SetGraphSizeView();
view.setFrame(FrameType.NONE);
HttpView.currentView().include(view, out);
}
Expand Down 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()).toContainerRelativeURL());
return super.createDeleteButton(showConfirmation);
}

Expand Down Expand Up @@ -300,9 +300,9 @@ protected void populateButtonBar(DataView view, ButtonBar bar)
if (queryName.equals(FlowTableType.FCSFiles.toString()))
{
ActionURL editWellsURL = new ActionURL(WellController.EditWellAction.class, getContainer());
URLHelper returnURL = getReturnURL();
editWellsURL.addReturnURL(returnURL);
editWellsURL.addParameter("editWellReturnUrl", getReturnURL().toString());
URLHelper returnUrl = getReturnUrl();
editWellsURL.addReturnUrl(returnUrl);
editWellsURL.addParameter("editWellReturnUrl", returnUrl.toString());
editWellsURL.addParameter("ff_isBulkEdit", true);
editWellsURL.addParameter("isUpdate", false);

Expand Down Expand Up @@ -334,7 +334,7 @@ public PanelButton createExportButton(@Nullable List<String> recordSelectorColum
form.setIncludeStatistics(true);
form.setIncludeFCSFiles(false);
form.setSelectionType("runs");
HttpView analysisExportView = new JspView<>("/org/labkey/flow/view/exportAnalysis.jsp", form);
JspView<?> analysisExportView = new JspView<>("/org/labkey/flow/view/exportAnalysis.jsp", form);
panelButton.addSubPanel("Analysis", analysisExportView);
}
else if (queryName.equals(FlowTableType.FCSFiles.toString()) || queryName.equals(FlowTableType.FCSAnalyses.toString()) || queryName.equals(FlowTableType.CompensationControls.toString()))
Expand All @@ -346,7 +346,7 @@ else if (queryName.equals(FlowTableType.FCSFiles.toString()) || queryName.equals
form.setIncludeStatistics(false);
form.setIncludeFCSFiles(true);
form.setSelectionType("wells");
HttpView analysisExportView = new JspView<>("/org/labkey/flow/view/exportAnalysis.jsp", form);
JspView<?> analysisExportView = new JspView<>("/org/labkey/flow/view/exportAnalysis.jsp", form);
panelButton.addSubPanel("Analysis", analysisExportView);
}
}
Expand Down
4 changes: 2 additions & 2 deletions flow/src/org/labkey/flow/webparts/AnalysesWebPart.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public AnalysesWebPart(ViewContext context, Portal.WebPart wp)
setShowDeleteButtonConfirmationText(false);
setShowExportButtons(false);
setShowPagination(false);
// Workaround for "Issue 18903: can't change query on showRuns.view" -- for now, just don't display the [details] link which includes the returnURL parameter.
// Workaround for "Issue 18903: can't change query on showRuns.view" -- for now, just don't display the [details] link which includes the returnUrl parameter.
setShowDetailsColumn(false);
setButtonBarPosition(DataRegion.ButtonBarPosition.TOP);
}
Expand Down Expand Up @@ -77,7 +77,7 @@ protected void populateButtonBar(DataView view, ButtonBar bar)
bar.add(btnAnalyze);
}

ActionURL createRunGroupURL = PageFlowUtil.urlProvider(ExperimentUrls.class).getCreateRunGroupURL(getContainer(), getReturnURL(), false);
ActionURL createRunGroupURL = PageFlowUtil.urlProvider(ExperimentUrls.class).getCreateRunGroupURL(getContainer(), getReturnUrl(), false);
ActionButton createExperiment = new ActionButton(createRunGroupURL, "Create Analysis Folder", ActionButton.Action.POST);
createExperiment.setActionType(ActionButton.Action.LINK);
createExperiment.setDisplayPermission(InsertPermission.class);
Expand Down
Loading