Skip to content

Complete migration from srcURL and returnURL to returnUrl #157

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

Merged
labkey-jeckels merged 1 commit into from
Mar 5, 2025
Merged

Complete migration from srcURL and returnURL to returnUrl #157

Show file tree
Hide file tree
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
49 changes: 22 additions & 27 deletions genotyping/src/org/labkey/genotyping/GenotypingController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ public boolean handlePost(ReturnUrlForm returnUrlForm, BindException errors)
public URLHelper getSuccessURL(ReturnUrlForm form)
{
ActionURL begin = PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(getContainer());
return form.getReturnURLHelper(begin);
return form.getReturnUrlHelper(begin);
}
}

Expand Down Expand Up @@ -494,18 +494,18 @@ public void setMessage(String message)
}


private ActionURL getAdminURL(String message, ActionURL returnURL)
private ActionURL getAdminURL(String message, ActionURL returnUrl)
{
ActionURL url = getAdminURL(getContainer(), returnURL);
ActionURL url = getAdminURL(getContainer(), returnUrl);
url.addParameter("message", message);
return url;
}


public static ActionURL getAdminURL(Container c, ActionURL returnURL)
public static ActionURL getAdminURL(Container c, ActionURL returnUrl)
{
ActionURL url = new ActionURL(AdminAction.class, c);
url.addReturnURL(returnURL);
url.addReturnUrl(returnUrl);
return url;
}

Expand Down Expand Up @@ -684,10 +684,10 @@ public void setGalaxyKey(String galaxyKey)
}


public static ActionURL getMySettingsURL(Container c, ActionURL returnURL)
public static ActionURL getMySettingsURL(Container c, ActionURL returnUrl)
{
ActionURL url = new ActionURL(MySettingsAction.class, c);
url.addReturnURL(returnURL);
url.addReturnUrl(returnUrl);
return url;
}

Expand Down Expand Up @@ -752,7 +752,7 @@ public boolean handlePost(MySettingsForm form, BindException errors)
@Override
public URLHelper getSuccessURL(MySettingsForm form)
{
return form.getReturnURLHelper();
return form.getReturnUrlHelper();
}

@Override
Expand Down Expand Up @@ -1110,7 +1110,7 @@ private ActionURL getAnalyzeURL(int runId, ActionURL cancelURL)
{
ActionURL url = new ActionURL(AnalyzeAction.class, getContainer());
url.addParameter("run", runId);
url.addReturnURL(cancelURL);
url.addReturnUrl(cancelURL);
return url;
}

Expand Down Expand Up @@ -1232,13 +1232,13 @@ public static class AnalyzeBean
{
private final SortedSet<CustomView> _sequencesViews;
private final Map<Integer, Pair<String, String>> _sampleMap;
private final ActionURL _returnURL;
private final ActionURL _returnUrl;

private AnalyzeBean(SortedSet<CustomView> sequenceViews, Map<Integer, Pair<String, String>> sampleMap, ActionURL returnURL)
private AnalyzeBean(SortedSet<CustomView> sequenceViews, Map<Integer, Pair<String, String>> sampleMap, ActionURL returnUrl)
{
_sequencesViews = sequenceViews;
_sampleMap = sampleMap;
_returnURL = returnURL;
_returnUrl = returnUrl;
}

public SortedSet<CustomView> getSequencesViews()
Expand All @@ -1251,9 +1251,9 @@ public Map<Integer, Pair<String, String>> getSampleMap()
return _sampleMap;
}

public ActionURL getReturnURL()
public ActionURL getReturnUrl()
{
return _returnURL;
return _returnUrl;
}
}

Expand Down Expand Up @@ -2015,13 +2015,13 @@ public class AssignmentReportBean
{
private final Collection<Integer> _ids;
private final String _assayName;
private final ActionURL _returnURL;
private final ActionURL _returnUrl;

public AssignmentReportBean(Collection<Integer> ids, String assayName, ActionURL returnURL)
public AssignmentReportBean(Collection<Integer> ids, String assayName, ActionURL returnUrl)
{
_ids = ids;
_assayName = assayName;
_returnURL = returnURL;
_returnUrl = returnUrl;
}

public Collection<Integer> getIds()
Expand All @@ -2034,9 +2034,9 @@ public String getAssayName()
return _assayName;
}

public ActionURL getReturnURL()
public ActionURL getReturnUrl()
{
return _returnURL;
return _returnUrl;
}
}

Expand All @@ -2057,10 +2057,10 @@ public ModelAndView getView(ProtocolIdForm form, BindException errors)
AssayHeaderView header = new AssayHeaderView(form.getProtocol(), form.getProvider(), false, true, null);
result.addView(header);

ActionURL returnURL = form.getReturnActionURL(PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(getContainer()));
ActionURL returnUrl = form.getReturnActionURL(PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(getContainer()));

AssignmentReportBean bean = new AssignmentReportBean(selected, _protocol.getName(), returnURL);
JspView report = new JspView<>("/org/labkey/genotyping/view/haplotypeAssignmentReport.jsp", bean);
AssignmentReportBean bean = new AssignmentReportBean(selected, _protocol.getName(), returnUrl);
JspView<?> report = new JspView<>("/org/labkey/genotyping/view/haplotypeAssignmentReport.jsp", bean);
result.addView(report);

return result;
Expand Down Expand Up @@ -2361,10 +2361,5 @@ public void setRowId(int rowId)
{
_rowId = rowId;
}

public void setSrcURL(String srcURL)
{
ReturnUrlForm.throwBadParam();
}
}
}
2 changes: 1 addition & 1 deletion genotyping/src/org/labkey/genotyping/view/analyze.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ var f = new LABKEY.ext.FormPanel({
description,
selectedSamples
],
buttons:[{text:'Submit', type:'submit', handler:submit}, {text:'Cancel', handler:function() {document.location = <%=q(bean.getReturnURL())%>;}}],
buttons:[{text:'Submit', type:'submit', handler:submit}, {text:'Cancel', handler:function() {document.location = <%=q(bean.getReturnUrl())%>;}}],
buttonAlign:'left'
});

Expand Down
6 changes: 3 additions & 3 deletions genotyping/src/org/labkey/genotyping/view/configure.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@

ActionURL animalQueryURL = QueryService.get().urlFor(getUser(), getContainer(), QueryAction.executeQuery, "genotyping", "Animal");
ActionURL animalEditDomainURL = PropertyService.get().getDomainKind(schema.getDomainURI(GenotypingQuerySchema.TableType.Animal.name())).urlCreateDefinition(GenotypingQuerySchema.NAME, GenotypingQuerySchema.TableType.Animal.name(), getContainer(), getUser());
animalEditDomainURL.addReturnURL(getActionURL());
animalEditDomainURL.addReturnUrl(getActionURL());

ActionURL haplotypeQueryURL = QueryService.get().urlFor(getUser(), getContainer(), QueryAction.executeQuery, "genotyping", "Haplotype");
ActionURL haplotypeEditDomainURL = PropertyService.get().getDomainKind(schema.getDomainURI(GenotypingQuerySchema.TableType.Haplotype.name())).urlCreateDefinition(GenotypingQuerySchema.NAME, GenotypingQuerySchema.TableType.Haplotype.name(), getContainer(), getUser());
haplotypeEditDomainURL.addReturnURL(getActionURL());
haplotypeEditDomainURL.addReturnUrl(getActionURL());
%>
<script type="text/javascript" nonce="<%=getScriptNonce()%>">
var queries = {};
Expand Down Expand Up @@ -166,6 +166,6 @@
</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr><td><%= button("Submit").submit(true) %> <%= button("Done").href(form.getReturnURLHelper()) %><%=generateReturnUrlFormField(form)%></td></tr>
<tr><td><%= button("Submit").submit(true) %> <%= button("Done").href(form.getReturnUrlHelper()) %><%=generateReturnUrlFormField(form)%></td></tr>
</table>
</form>
6 changes: 3 additions & 3 deletions genotyping/src/org/labkey/genotyping/view/editHaplotypeAssignment.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
GenotypingController.AssignmentForm bean = me.getModelBean();
final String formDivId = "form" + getRequestScopedUID();

ActionURL returnURL = bean.getReturnActionURL(urlProvider(ProjectUrls.class).getBeginURL(getContainer()));
ActionURL returnUrl = bean.getReturnActionURL(urlProvider(ProjectUrls.class).getBeginURL(getContainer()));
%>
<%
if (getErrors("form").hasErrors())
Expand Down Expand Up @@ -111,7 +111,7 @@
commands: commands,
success: function(data) {
assignmentForm.getEl().unmask();
window.location = <%=q(returnURL)%>
window.location = <%=q(returnUrl)%>
},
failure: function(response) {
alert(response.exception);
Expand All @@ -123,7 +123,7 @@
{
text: 'Cancel',
handler: function(){
window.location = <%=q(returnURL)%>
window.location = <%=q(returnUrl)%>
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion genotyping/src/org/labkey/genotyping/view/haplotypeAssignmentReport.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
{
text: 'Cancel',
handler: function(){
window.location = <%=q(bean.getReturnURL())%>;
window.location = <%=q(bean.getReturnUrl())%>;
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion genotyping/src/org/labkey/genotyping/view/mySettings.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@
<tr><td>&nbsp;</td></tr>
<tr><td>Galaxy web API key</td><td><input size="40" name="galaxyKey" value="<%=h(form.getGalaxyKey())%>"></td></tr>
<tr><td>&nbsp;</td></tr>
<tr><td><%= button("Submit").submit(true) %> <%= button("Cancel").href(form.getReturnURLHelper()) %><%=generateReturnUrlFormField(form)%></td></tr>
<tr><td><%= button("Submit").submit(true) %> <%= button("Cancel").href(form.getReturnUrlHelper()) %><%=generateReturnUrlFormField(form)%></td></tr>
</table>
</labkey:form>