Issue 51749: Site validator fails on some wikis (#6096)

LabKey · Nov 26, 2024 · 0f4b42e · 0f4b42e
1 parent 28714cb
commit 0f4b42e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/api/src/org/labkey/api/view/Portal.java b/api/src/org/labkey/api/view/Portal.java
@@ -1712,10 +1712,9 @@ public static WebPartView getWebPartViewSafe(@NotNull WebPartFactory factory, @N
         }
         catch(Throwable t)
         {
-            WebPartView errorView;
             int status = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
             String message = "An unexpected error occurred";
-            errorView = ExceptionUtil.getErrorWebPartView(status, message, t, portalCtx.getRequest());
+            WebPartView<?> errorView = ExceptionUtil.getErrorWebPartView(status, message, t, portalCtx.getRequest());
             errorView.setTitle(webPart.getName());
             errorView.setWebPart(webPart);
             return errorView;

diff --git a/core/src/org/labkey/core/admin/sitevalidation/SiteValidationJob.java b/core/src/org/labkey/core/admin/sitevalidation/SiteValidationJob.java
@@ -6,6 +6,7 @@
 import org.labkey.api.pipeline.PipelineJob;
 import org.labkey.api.pipeline.PipelineService;
 import org.labkey.api.pipeline.PipelineStatusFile;
+import org.labkey.api.settings.AppProps;
 import org.labkey.api.util.FileUtil;
 import org.labkey.api.util.StringUtilsLabKey;
 import org.labkey.api.util.URLHelper;
@@ -60,7 +61,11 @@ public void run()
             setStatus(s);
         });
         JspTemplate<SiteValidationForm> template = new JspTemplate<>("/org/labkey/core/admin/sitevalidation/siteValidation.jsp", _form);
-        ViewContext context = new ViewContext(getInfo());
+        // Issue 51749 - ensure we have a URL for wiki validation
+        ViewBackgroundInfo info = new ViewBackgroundInfo(getInfo().getContainer(),
+                getInfo().getUser(),
+                getInfo().getURL() == null ? AppProps.getInstance().getHomePageActionURL() : getInfo().getURL());
+        ViewContext context = new ViewContext(info);
         template.setViewContext(context);
         File results = FileUtil.appendName(getPipeRoot().getLogDirectory(), getResultsFileName());