Merge branch 'develop' into fb_quantity

Author: cnathe

SkylineToolsStore/src/org/labkey/skylinetoolsstore/SkylineToolsStoreController.java

@@ -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
@@ -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");
@@ -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
@@ -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
@@ -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
             {
@@ -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

SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolDetails.jsp

@@ -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");}
         }

SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolsStoreWebPart.jsp

@@ -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>
@@ -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>

nextflow/src/org/labkey/nextflow/NextFlowController.java

@@ -29,8 +29,8 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Path;
-import org.labkey.api.util.URLHelper;
 import org.labkey.api.util.SelectBuilder;
+import org.labkey.api.util.URLHelper;
 import org.labkey.api.util.logging.LogHelper;
 import org.labkey.api.view.HtmlView;
 import org.labkey.api.view.JspView;
@@ -163,8 +163,7 @@ public URLHelper getSuccessURL(NextFlowConfiguration nextFlowConfiguration)
         @Override
         public void addNavTrail(NavTree root)
         {
-            root.addChild("Admin Console", PageFlowUtil.urlProvider(AdminUrls.class).getAdminConsoleURL());
-            root.addChild("Configure NextFlow");
+            PageFlowUtil.urlProvider(AdminUrls.class).addAdminNavTrail(root, "Configure NextFlow", getClass(), getContainer());
         }
     }