Fixed: Correct library ftl call to render the email body (OFBIZ-9138 Create a common theme)
add possibility to call the ThemeFactory.resolveTheme() with empty request if the visualTheme normaly present on the service context isn't found, so we return the default theme define in general.properties Thanks to Jacques for raise this problem git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806237 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -73,8 +73,10 @@ import org.apache.ofbiz.service.LocalDispatcher;
|
||||
import org.apache.ofbiz.service.ServiceUtil;
|
||||
import org.apache.ofbiz.service.mail.MimeMessageWrapper;
|
||||
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;
|
||||
import org.apache.ofbiz.widget.renderer.macro.MacroScreenRenderer;
|
||||
import org.xml.sax.SAXException;
|
||||
|
||||
@@ -431,6 +433,8 @@ public class EmailServices {
|
||||
String attachmentNameParam = (String) serviceContext.remove("attachmentName");
|
||||
List<String> xslfoAttachScreenLocationListParam = UtilGenerics.checkList(serviceContext.remove("xslfoAttachScreenLocationList"));
|
||||
List<String> attachmentNameListParam = UtilGenerics.checkList(serviceContext.remove("attachmentNameList"));
|
||||
VisualTheme visualTheme = (VisualTheme) rServiceContext.get("visualTheme");
|
||||
if (visualTheme == null) visualTheme = ThemeFactory.resolveVisualTheme(null);
|
||||
|
||||
List<String> xslfoAttachScreenLocationList = new LinkedList<String>();
|
||||
List<String> attachmentNameList = new LinkedList<String>();
|
||||
@@ -473,8 +477,7 @@ public class EmailServices {
|
||||
|
||||
ScreenStringRenderer screenStringRenderer = null;
|
||||
try {
|
||||
screenStringRenderer = new MacroScreenRenderer(EntityUtilProperties.getPropertyValue("widget", "screen.name", dctx.getDelegator()),
|
||||
EntityUtilProperties.getPropertyValue("widget", "screen.screenrenderer", dctx.getDelegator()));
|
||||
screenStringRenderer = new MacroScreenRenderer("screen", visualTheme.getModelTheme().getScreenRendererLocation("screen"));
|
||||
} catch (TemplateException e) {
|
||||
Debug.logError(e, "Error rendering screen for email: " + e.toString(), module);
|
||||
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "CommonEmailSendRenderingScreenEmailError", UtilMisc.toMap("errorString", e.toString()), locale));
|
||||
|
||||
Reference in New Issue
Block a user