Skip to content

Redirect to ActionURL instead of a String URL #559

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
vagisha merged 1 commit into from
Jul 30, 2025
Merged

Redirect to ActionURL instead of a String URL #559

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
18 changes: 8 additions & 10 deletions SkylineToolsStore/src/org/labkey/skylinetoolsstore/SkylineToolsStoreController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ else if (!getContainer().hasPermission(getUser(), InsertPermission.class))
tool.setLatest(true);
SkylineToolsStoreManager.get().insertTool(c, getUser(), tool);

return HttpView.redirect(SkylineToolStoreUrls.getToolDetailsUrl(tool).getLocalURIString());
return HttpView.redirect(SkylineToolStoreUrls.getToolDetailsUrl(tool));
}
}
else
Expand Down Expand Up @@ -868,7 +868,6 @@ public DeleteSupplementAction()
@Override
public ModelAndView handleRequestInternal(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception
{
final String sender = httpServletRequest.getParameter("sender");
final int suppTarget = Integer.parseInt(httpServletRequest.getParameter("supptarget"));

final String suppFile = httpServletRequest.getParameter("suppFile");
Expand All @@ -890,8 +889,7 @@ public ModelAndView handleRequestInternal(HttpServletRequest httpServletRequest,
else
throw new Exception();

return HttpView.redirect((sender != null) ? sender :
SkylineToolStoreUrls.getToolDetailsUrl(tool).getLocalURIString());
return HttpView.redirect(SkylineToolStoreUrls.getToolDetailsUrl(tool));
}

@Override
Expand Down Expand Up @@ -1049,8 +1047,8 @@ public ModelAndView handleRequestInternal(HttpServletRequest httpServletRequest,
}
}

return HttpView.redirect((senderUrl != null) ? senderUrl.getLocalURIString() :
SkylineToolStoreUrls.getToolStoreHomeUrl(toolStoreContainer, getUser()).getLocalURIString());
return HttpView.redirect((senderUrl != null) ? senderUrl :
SkylineToolStoreUrls.getToolStoreHomeUrl(toolStoreContainer, getUser()));
}

@Override
Expand Down Expand Up @@ -1383,8 +1381,9 @@ public ModelAndView handleRequestInternal(HttpServletRequest httpServletRequest,

Container toolStoreContainer = tool != null ? tool.getContainerParent() : getContainer();

return HttpView.redirect((sender != null) ? sender :
SkylineToolStoreUrls.getToolStoreHomeUrl(toolStoreContainer, getUser()).getLocalURIString());

return HttpView.redirect((sender != null) ? new ActionURL(sender) :
SkylineToolStoreUrls.getToolStoreHomeUrl(toolStoreContainer, getUser()));
}
else
{
Expand Down Expand Up @@ -1505,8 +1504,7 @@ else if (!lowerName.startsWith("tool-inf/") ||
else
tool.writeIconToFile(makeFile(tool.lookupContainer(), "icon.png"), "png");

String sender = httpServletRequest.getParameter("sender");
return HttpView.redirect((sender != null) ? sender : new ActionURL(BeginAction.class, getContainer()).getLocalURIString());
return HttpView.redirect(SkylineToolStoreUrls.getToolDetailsUrl(tool));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolDetails.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ a { text-decoration: none; }
buttons: {
Ok: function() {
setButtonsEnabled(false);
window.location = "<%=h(urlFor(SkylineToolsStoreController.DeleteLatestAction.class).addParameter("id", tool.getRowId()).addParameter("sender", toolDetailsLatestUrl.getLocalURIString()))%>"
window.location = <%=q(urlFor(SkylineToolsStoreController.DeleteLatestAction.class).addParameter("id", tool.getRowId()).addParameter("sender", toolDetailsLatestUrl.getLocalURIString()))%>
},
Cancel: function() {$(this).dialog("close");}
}
Expand Down
4 changes: 2 additions & 2 deletions SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolsStoreWebPart.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
<p>
<label for="toolOwnersManage">Tool owners </label><br />
<input type="text" id="toolOwnersManage" class="toolOwners" name="toolOwners" /><br /><br />
<input type="hidden" name="sender" value="<%= h(request.getRequestURL()) %>" />
<input type="hidden" name="sender" value="<%= h(getActionURL()) %>" />
<input type="hidden" id="updatetargetOwners" name="updatetarget" value="" />
<input type="submit" value="Update Tool Owners" />
</p>
Expand All @@ -203,7 +203,7 @@
<label for="toolOwnersNew">Tool owners </label><br />
<input type="text" id="toolOwnersNew" class="toolOwners" name="toolOwners" /><br /><br /><br />
</span>
<input type="hidden" name="sender" value="<%= h(request.getRequestURL()) %>" />
<input type="hidden" name="sender" value="<%= h(getActionURL()) %>" />
<input type="hidden" id="updatetarget" name="updatetarget" value="" />
<input type="submit" value="Upload Tool" />
</p>
Expand Down