From 53b183672fd97844f993caa6c5e6d404b4619451 Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Tue, 4 Mar 2025 09:04:24 -0800
Subject: [PATCH] Complete migration from srcURL and returnURL to returnUrl

---
 .../mcc/query/RequestReviewActionsDisplayColumnFactory.java | 3 +--
 .../mcc/query/RequestScoreActionsDisplayColumnFactory.java  | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mcc/src/org/labkey/mcc/query/RequestReviewActionsDisplayColumnFactory.java b/mcc/src/org/labkey/mcc/query/RequestReviewActionsDisplayColumnFactory.java
index 68a042598..f2b21031d 100644
--- a/mcc/src/org/labkey/mcc/query/RequestReviewActionsDisplayColumnFactory.java
+++ b/mcc/src/org/labkey/mcc/query/RequestReviewActionsDisplayColumnFactory.java
@@ -4,7 +4,6 @@
 import org.apache.logging.log4j.Logger;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.Container;
-import org.labkey.api.data.DataColumn;
 import org.labkey.api.data.DisplayColumn;
 import org.labkey.api.data.DisplayColumnFactory;
 import org.labkey.api.data.RenderContext;
@@ -45,7 +44,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
                 String requestId = ctx.get(getBoundKey("requestId"), String.class);
                 Container requestContainer = MccManager.get().getMCCRequestContainer(ctx.getContainer());
                 DetailsURL url = DetailsURL.fromString("/mcc/requestReview.view?requestId=" + requestId + "&mode=rabReview", requestContainer);
-                out.write("<a class=\"labkey-text-link\" href=\"" + url.getActionURL().addReturnURL(ctx.getViewContext().getActionURL()) + "\">Enter Review</a>");
+                out.write("<a class=\"labkey-text-link\" href=\"" + url.getActionURL().addReturnUrl(ctx.getViewContext().getActionURL()) + "\">Enter Review</a>");
             }
 
             @Override
diff --git a/mcc/src/org/labkey/mcc/query/RequestScoreActionsDisplayColumnFactory.java b/mcc/src/org/labkey/mcc/query/RequestScoreActionsDisplayColumnFactory.java
index 3ca12b80e..70a4cdab4 100644
--- a/mcc/src/org/labkey/mcc/query/RequestScoreActionsDisplayColumnFactory.java
+++ b/mcc/src/org/labkey/mcc/query/RequestScoreActionsDisplayColumnFactory.java
@@ -76,7 +76,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
                             if (requestContainer.hasPermission(ctx.getViewContext().getUser(), MccRequestAdminPermission.class))
                             {
                                 DetailsURL url = DetailsURL.fromString("/mcc/requestReview.view?requestId=" + requestId + "&mode=primaryReview", requestContainer);
-                                out.write("<br><a class=\"labkey-text-link\" href=\"" + url.getActionURL().addReturnURL(ctx.getViewContext().getActionURL()) + "\">Enter MCC Internal Review</a>");
+                                out.write("<br><a class=\"labkey-text-link\" href=\"" + url.getActionURL().addReturnUrl(ctx.getViewContext().getActionURL()) + "\">Enter MCC Internal Review</a>");
                             }
                         }
                         else if (st == MccManager.RequestStatus.RabReview && ctx.get(FieldKey.fromString("pendingRabReviews"), Integer.class) == 0)
@@ -84,7 +84,7 @@ else if (st == MccManager.RequestStatus.RabReview && ctx.get(FieldKey.fromString
                             if (requestContainer.hasPermission(ctx.getViewContext().getUser(), MccFinalReviewPermission.class))
                             {
                                 DetailsURL url = DetailsURL.fromString("/mcc/requestReview.view?requestId=" + requestId + "&mode=resourceAvailability", requestContainer);
-                                out.write("<br><a class=\"labkey-text-link\" href=\"" + url.getActionURL().addReturnURL(ctx.getViewContext().getActionURL()) + "\">Enter Resource Availability Assessment</a>");
+                                out.write("<br><a class=\"labkey-text-link\" href=\"" + url.getActionURL().addReturnUrl(ctx.getViewContext().getActionURL()) + "\">Enter Resource Availability Assessment</a>");
                             }
                         }
                         else if (st == MccManager.RequestStatus.PendingDecision)
@@ -92,7 +92,7 @@ else if (st == MccManager.RequestStatus.PendingDecision)
                             if (requestContainer.hasPermission(ctx.getViewContext().getUser(), MccFinalReviewPermission.class))
                             {
                                 DetailsURL url = DetailsURL.fromString("/mcc/requestReview.view?requestId=" + requestId + "&mode=finalReview", requestContainer);
-                                out.write("<br><a class=\"labkey-text-link\" href=\"" + url.getActionURL().addReturnURL(ctx.getViewContext().getActionURL()) + "\">Enter Final Review</a>");
+                                out.write("<br><a class=\"labkey-text-link\" href=\"" + url.getActionURL().addReturnUrl(ctx.getViewContext().getActionURL()) + "\">Enter Final Review</a>");
                             }
                         }
                         else if (st == MccManager.RequestStatus.Approved)