diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java index 4b15f5f090..f6678fa50c 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java @@ -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 xslfoAttachScreenLocationListParam = UtilGenerics.checkList(serviceContext.remove("xslfoAttachScreenLocationList")); List attachmentNameListParam = UtilGenerics.checkList(serviceContext.remove("attachmentNameList")); + VisualTheme visualTheme = (VisualTheme) rServiceContext.get("visualTheme"); + if (visualTheme == null) visualTheme = ThemeFactory.resolveVisualTheme(null); List xslfoAttachScreenLocationList = new LinkedList(); List attachmentNameList = new LinkedList(); @@ -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)); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java index 7321a3528d..d564113cb0 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java @@ -191,30 +191,32 @@ public class ThemeFactory { */ public static VisualTheme resolveVisualTheme(HttpServletRequest request) { String visualThemeId = null; - HttpSession session = request.getSession(); - GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); - //search on request only if a userLogin is present on session (otherwise this implied that the user isn't identify so wait - if (userLogin != null) { - VisualTheme visualTheme = (VisualTheme) session.getAttribute("visualTheme"); - if (visualTheme != null) return visualTheme; + if (request != null) { + HttpSession session = request.getSession(); + GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); + //search on request only if a userLogin is present on session (otherwise this implied that the user isn't identify so wait + if (userLogin != null) { + VisualTheme visualTheme = (VisualTheme) session.getAttribute("visualTheme"); + if (visualTheme != null) return visualTheme; - //resolve on user pref - LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); - if (dispatcher != null) { - try { - Map userPreferencesResult = dispatcher.runSync("getUserPreference", - UtilMisc.toMap("userLogin", userLogin, "userPrefTypeId", "VISUAL_THEME")); - visualThemeId = (String) userPreferencesResult.get("userPrefValue"); - } catch (GenericServiceException e) { - Debug.logError("Impossible to resolve the theme from user prefrence for " + userLogin.get("userLoginId"), module); + //resolve on user pref + LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); + if (dispatcher != null) { + try { + Map userPreferencesResult = dispatcher.runSync("getUserPreference", + UtilMisc.toMap("userLogin", userLogin, "userPrefTypeId", "VISUAL_THEME")); + visualThemeId = (String) userPreferencesResult.get("userPrefValue"); + } catch (GenericServiceException e) { + Debug.logError("Impossible to resolve the theme from user prefrence for " + userLogin.get("userLoginId"), module); + } } } - } - //resolve from webapp - if (visualThemeId == null) { - ServletContext servletContext = request.getServletContext(); - visualThemeId = servletContext.getInitParameter("visualThemeId"); + //resolve from webapp + if (visualThemeId == null) { + ServletContext servletContext = request.getServletContext(); + visualThemeId = servletContext.getInitParameter("visualThemeId"); + } } //resolve from general properties