"Applied fix from plugins 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-plugins/branches/release18.12@1859737 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -46,8 +46,8 @@ import org.apache.ofbiz.common.email.NotificationServices;
|
||||
import org.apache.ofbiz.entity.Delegator;
|
||||
import org.apache.ofbiz.security.Security;
|
||||
import org.apache.ofbiz.service.DispatchContext;
|
||||
import org.apache.ofbiz.service.LocalDispatcher;
|
||||
import org.apache.ofbiz.service.GenericServiceException;
|
||||
import org.apache.ofbiz.service.LocalDispatcher;
|
||||
import org.apache.ofbiz.service.ServiceUtil;
|
||||
import org.apache.ofbiz.widget.model.ThemeFactory;
|
||||
import org.apache.ofbiz.widget.renderer.ScreenRenderer;
|
||||
@@ -90,6 +90,9 @@ public class BirtEmailServices {
|
||||
String birtImageDirectory = (String) serviceContext.remove(BirtWorker.getBirtImageDirectory());
|
||||
String birtContentType = (String) serviceContext.remove(BirtWorker.getBirtContentType());
|
||||
VisualTheme visualTheme = (VisualTheme) context.get("visualTheme");
|
||||
if (visualTheme == null) {
|
||||
visualTheme = ThemeFactory.resolveVisualTheme(null);
|
||||
}
|
||||
if (visualTheme == null) visualTheme = ThemeFactory.resolveVisualTheme(null);
|
||||
if (bodyParameters == null) {
|
||||
bodyParameters = MapStack.create();
|
||||
|
||||
@@ -69,6 +69,9 @@ public class ExamplePrintServices {
|
||||
String screenLocation = "component://example/widget/example/ExampleReportScreens.xml";
|
||||
String reportScreenName = "ExampleReport";
|
||||
VisualTheme visualTheme = (VisualTheme) context.get("visualTheme");
|
||||
if (visualTheme == null) {
|
||||
visualTheme = ThemeFactory.resolveVisualTheme(null);
|
||||
}
|
||||
if (visualTheme == null) visualTheme = ThemeFactory.resolveVisualTheme(null);
|
||||
Map<String, Object> workContext = new HashMap<String, Object>();
|
||||
workContext.putAll(context);
|
||||
|
||||
Reference in New Issue
Block a user