Merge pull request #171 from LabKey/fb_htmlview_string_string

labkey-matthewb · web-flow · commit 16a255e496f0 · 2023-12-15T18:26:26.000-08:00
refactor htmlview(String, String)
diff --git a/laboratory/src/org/labkey/laboratory/LaboratoryController.java b/laboratory/src/org/labkey/laboratory/LaboratoryController.java
@@ -243,7 +243,7 @@ public ModelAndView getConfirmView(EnsureAssayFieldsForm form, BindException err
             catch (ChangePropertyDescriptorException e)
             {
                 ExceptionUtil.logExceptionToMothership(getViewContext().getRequest(), e);
-                return new HtmlView("There was an error inspecting this assay: " + e.getMessage());
+                return HtmlView.of("There was an error inspecting this assay: " + e.getMessage());
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ public ModelAndView getConfirmView(EnsureAssayFieldsForm form, BindException err`
`243`	`243`	`catch (ChangePropertyDescriptorException e)`
`244`	`244`	`{`
`245`	`245`	`ExceptionUtil.logExceptionToMothership(getViewContext().getRequest(), e);`
`246`		`- return new HtmlView("There was an error inspecting this assay: " + e.getMessage());`
	`246`	`+ return HtmlView.of("There was an error inspecting this assay: " + e.getMessage());`
`247`	`247`	`}`
`248`	`248`	`}`
`249`	`249`