Merge pull request #5416 from jay-hodgson/SWC-6864

SWC-6864
Sage-Bionetworks · Jun 5, 2024 · 35b31e0 · 35b31e0
2 parents f8ad328 + c23324e
commit 35b31e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/org/sagebionetworks/web/client/GWTWrapperImpl.java b/src/main/java/org/sagebionetworks/web/client/GWTWrapperImpl.java
@@ -34,7 +34,7 @@ public class GWTWrapperImpl implements GWTWrapper {
 
   @Override
   public String getHostPageBaseURL() {
-    return GWT.getHostPageBaseURL();
+    return getHostpageUrl();
   }
 
   @Override

diff --git a/.../java/org/sagebionetworks/web/client/widget/entity/renderer/ButtonLinkWidgetViewImpl.java b/.../java/org/sagebionetworks/web/client/widget/entity/renderer/ButtonLinkWidgetViewImpl.java
@@ -70,13 +70,17 @@ public ButtonLinkWidgetViewImpl(
   public void configure(
     WikiPageKey wikiKey,
     String buttonText,
-    final String url,
+    String url,
     boolean isHighlight,
     final boolean openInNewWindow
   ) {
     clear();
     button.setText(buttonText);
     if (isHighlight) button.setType(ButtonType.INFO);
+    // Detect old #!, and direct to the right place
+    if (url.startsWith("#!")) {
+      url = "/" + url.substring("#!".length());
+    }
     button.setHref(url);
     if (openInNewWindow) {
       button