Skip to content

Commit

Permalink
Merge 24.3 to develop
Browse files Browse the repository at this point in the history
  • Loading branch information
labkey-teamcity committed May 21, 2024
2 parents 0a85897 + 4fbbad3 commit bef0d3c
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ public static String replaceLinkPlaceholders(@NotNull String text, @NotNull Expe
{
ActionURL viewMessageUrl = new ActionURL("announcements", "thread", announcementContainer)
.addParameter("rowId", announcement.getRowId());
toReturn = toReturn.replaceAll(PLACEHOLDER_MESSAGE_THREAD_URL, viewMessageUrl.getLocalURIString());
toReturn = toReturn.replaceAll(PLACEHOLDER_MESSAGE_THREAD_URL, viewMessageUrl.getURIString());
}
if (toReturn.contains(PLACEHOLDER_RESPOND_TO_MESSAGE_URL))
{
Expand All @@ -331,12 +331,12 @@ public static String replaceLinkPlaceholders(@NotNull String text, @NotNull Expe
ActionURL respondToMessageUrl = new ActionURL("announcements", "respond", announcementContainer)
.addParameter("parentId", announcement.getEntityId())
.addReturnURL(viewMessageUrl);
toReturn = toReturn.replaceAll(PLACEHOLDER_RESPOND_TO_MESSAGE_URL, respondToMessageUrl.getLocalURIString());
toReturn = toReturn.replaceAll(PLACEHOLDER_RESPOND_TO_MESSAGE_URL, respondToMessageUrl.getURIString());
}
if (toReturn.contains(PLACEHOLDER_MAKE_DATA_PUBLIC_URL))
{
ActionURL makePublicUrl = PanoramaPublicController.getMakePublicUrl(expAnnotations.getId(), expAnnotations.getContainer());
toReturn = toReturn.replaceAll(PLACEHOLDER_MAKE_DATA_PUBLIC_URL, makePublicUrl.getLocalURIString());
toReturn = toReturn.replaceAll(PLACEHOLDER_MAKE_DATA_PUBLIC_URL, makePublicUrl.getURIString());
}
return toReturn;
}
Expand Down

0 comments on commit bef0d3c

Please sign in to comment.