diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/output/OutputServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/output/OutputServices.java index 1a3fb90174..e62a7bdeda 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/output/OutputServices.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/output/OutputServices.java @@ -66,6 +66,7 @@ import org.apache.ofbiz.entity.util.EntityUtilProperties; import org.apache.ofbiz.service.DispatchContext; import org.apache.ofbiz.service.ServiceUtil; import org.apache.ofbiz.webapp.view.ApacheFopWorker; +import org.apache.ofbiz.widget.model.ThemeFactory; import org.apache.ofbiz.widget.renderer.ScreenRenderer; import org.apache.ofbiz.widget.renderer.ScreenStringRenderer; import org.apache.ofbiz.widget.renderer.VisualTheme; @@ -89,6 +90,9 @@ public class OutputServices { public static Map sendPrintFromScreen(DispatchContext dctx, Map serviceContext) { Locale locale = (Locale) serviceContext.get("locale"); VisualTheme visualTheme = (VisualTheme) serviceContext.get("visualTheme"); + if (visualTheme == null) { + visualTheme = ThemeFactory.resolveVisualTheme(null); + } String screenLocation = (String) serviceContext.remove("screenLocation"); Map screenContext = UtilGenerics.checkMap(serviceContext.remove("screenContext")); String contentType = (String) serviceContext.remove("contentType"); @@ -204,6 +208,9 @@ public class OutputServices { Locale locale = (Locale) serviceContext.get("locale"); Delegator delegator = dctx.getDelegator(); VisualTheme visualTheme = (VisualTheme) serviceContext.get("visualTheme"); + if (visualTheme == null) { + visualTheme = ThemeFactory.resolveVisualTheme(null); + } String screenLocation = (String) serviceContext.remove("screenLocation"); Map screenContext = UtilGenerics.checkMap(serviceContext.remove("screenContext")); String contentType = (String) serviceContext.remove("contentType"); diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java index 8fd3d81b57..3b1dff3113 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java @@ -37,6 +37,7 @@ import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.util.EntityUtilProperties; import org.apache.ofbiz.service.DispatchContext; import org.apache.ofbiz.service.LocalDispatcher; +import org.apache.ofbiz.widget.model.ThemeFactory; import org.apache.ofbiz.widget.renderer.ScreenRenderer; import org.apache.ofbiz.widget.renderer.ScreenStringRenderer; import org.apache.ofbiz.widget.renderer.VisualTheme; @@ -89,6 +90,9 @@ public class FoPrintServerEvents { public static byte[] getXslFo(DispatchContext dctx, String screen, Map parameters) throws GeneralException { // run as the system user VisualTheme visualTheme = (VisualTheme) parameters.get("visualTheme"); + if (visualTheme == null) { + visualTheme = ThemeFactory.resolveVisualTheme(null); + } GenericValue system = null; try { system = dctx.getDelegator().findOne("UserLogin", false, "userLoginId", "system");