Merge discvr-20.7 to develop

bbimber · bbimber · commit 3f482c641378 · 2020-10-19T20:30:35.000Z
diff --git a/LDK/src/org/labkey/ldk/LDKController.java b/LDK/src/org/labkey/ldk/LDKController.java
@@ -1061,7 +1061,7 @@ public ModelAndView getView(Object form, BindException errors) throws Exception
         {
             if (getContainer().hasPermission(getUser(), AdminPermission.class))
             {
-                return ModuleHtmlView.get(ModuleLoader.getInstance().getModule(LDKModule.class), Path.parse("/views/setRedirectUrl.html"));
+                return ModuleHtmlView.get(ModuleLoader.getInstance().getModule(LDKModule.class), "setRedirectUrl");
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -1061,7 +1061,7 @@ public ModelAndView getView(Object form, BindException errors) throws Exception`
`1061`	`1061`	`{`
`1062`	`1062`	`if (getContainer().hasPermission(getUser(), AdminPermission.class))`
`1063`	`1063`	`{`
`1064`		`- return ModuleHtmlView.get(ModuleLoader.getInstance().getModule(LDKModule.class), Path.parse("/views/setRedirectUrl.html"));`
	`1064`	`+ return ModuleHtmlView.get(ModuleLoader.getInstance().getModule(LDKModule.class), "setRedirectUrl");`
`1065`	`1065`	`}`
`1066`	`1066`	`else`
`1067`	`1067`	`{`