"Applied fix from trunk for revision: 1859735 "
------------------------------------------------------------------------ r1859735 | jleroux | 2019-05-22 18:41:04 +0200 (mer. 22 mai 2019) | 12 lignes Fixed: massPrintOrders service does not work (OFBIZ-11049) This problem was similar to what was resolved by r1806237 for OFBIZ-9138. This fixes it by using the same solution than in r1806237. If the visual theme is unknown in the the service context get the default theme from general.properties using ThemeFactory::resolveTheme. sendPrintFromScreen, createFileFromScreen, sendBirtMail, getXslFo and printReportPdf (in example) were concerned ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859738 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -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<String, Object> sendPrintFromScreen(DispatchContext dctx, Map<String, ? extends Object> 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<String, Object> 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<String, Object> screenContext = UtilGenerics.checkMap(serviceContext.remove("screenContext"));
|
||||
String contentType = (String) serviceContext.remove("contentType");
|
||||
|
||||
+4
@@ -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<String, Object> 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");
|
||||
|
||||
Reference in New Issue
Block a user