svn commit: r1806815 - /ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java

[nmalin]

Author: nmalin
Date: Thu Aug 31 15:39:29 2017
New Revision: 1806815

URL: http://svn.apache.org/viewvc?rev=1806815&view=rev
Log:
Fixed: Missing to use the modelTheme for the attached screen on email 
(OFBIZ-9138 Create a common theme)

Modified:
    
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java

Modified: 
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java?rev=1806815&r1=1806814&r2=1806815&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
 Thu Aug 31 15:39:29 2017
@@ -538,11 +538,9 @@ public class EmailServices {
                     // substitute the freemarker variables...
                     ScreenStringRenderer foScreenStringRenderer = null;
                     if(MimeConstants.MIME_PLAIN_TEXT.equals(attachmentType)){
-                        foScreenStringRenderer = new 
MacroScreenRenderer(EntityUtilProperties.getPropertyValue("widget", 
"screentext.name", dctx.getDelegator()),
-                                
EntityUtilProperties.getPropertyValue("widget", "screentext.screenrenderer", 
dctx.getDelegator()));   
+                        foScreenStringRenderer = new 
MacroScreenRenderer("screentext", 
visualTheme.getModelTheme().getScreenRendererLocation("screentext"));
                     }else{
-                        foScreenStringRenderer = new 
MacroScreenRenderer(EntityUtilProperties.getPropertyValue("widget", 
"screenfop.name", dctx.getDelegator()),
-                                
EntityUtilProperties.getPropertyValue("widget", "screenfop.screenrenderer", 
dctx.getDelegator()));
+                        foScreenStringRenderer = new 
MacroScreenRenderer("screenfop", 
visualTheme.getModelTheme().getScreenRendererLocation("screenfop"));
                     } 
                     ScreenRenderer screensAtt = new ScreenRenderer(writer, 
screenContext, foScreenStringRenderer);
                     screensAtt.populateContextForService(dctx, bodyParameters);