[ofbiz-framework] branch trunk updated: Fixed: Show border and file name for content rendered from ftl (OFBIZ-12002)

[jamesyong]

This is an automated email from the ASF dual-hosted git repository.

jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 2cc3ab0  Fixed: Show border and file name for content rendered from 
ftl (OFBIZ-12002)
2cc3ab0 is described below

commit 2cc3ab0f668cd6b91e9ee0766b71a1006d09d639
Author: James Yong <jamesy...@apache.org>
AuthorDate: Sat Sep 19 23:34:53 2020 +0800

    Fixed: Show border and file name for content rendered from ftl (OFBIZ-12002)
    
    Error in testIntegration
    
    Thanks Jacques for reporting
---
 .../widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
index 800f812..3cd8e5f 100644
--- 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
+++ 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
@@ -167,7 +167,7 @@ public class HtmlWidget extends ModelScreenWidget {
                 if (insertWidgetBoundaryComments) {
                     
writer.append(HtmlWidgetRenderer.buildBoundaryComment("Begin", "Template", 
location));
                 }
-                boolean insertWidgetNamedBorder = 
ModelWidget.widgetNamedBorderEnabled();
+                boolean insertWidgetNamedBorder = 
!location.endsWith(".fo.ftl") && ModelWidget.widgetNamedBorderEnabled();
                 if (insertWidgetNamedBorder) {
                     writer.append(HtmlWidgetRenderer.buildNamedBorder("Begin", 
"Template", location));
                 }