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 127cd86 Improved: Open Screen file from browser (OFBIZ-12038)
127cd86 is described below
commit 127cd86da70b8c31942d23760533d015cfc438df
Author: James Yong <[email protected]>
AuthorDate: Sun Oct 11 09:18:58 2020 +0800
Improved: Open Screen file from browser (OFBIZ-12038)
Refactoring
---
.../src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 516b69b..942b3c1 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
@@ -168,7 +168,7 @@ public class HtmlWidget extends ModelScreenWidget {
if (insertWidgetBoundaryComments) {
writer.append(HtmlWidgetRenderer.buildBoundaryComment("Begin", "Template",
location));
}
- if (!location.endsWith(".fo.ftl") &&
HtmlWidgetRenderer.NAMED_BORDER_TYPE != ModelWidget.NamedBorderType.NONE) {
+ if (HtmlWidgetRenderer.NAMED_BORDER_TYPE !=
ModelWidget.NamedBorderType.NONE && !location.endsWith(".fo.ftl")) {
HttpServletRequest request = ((HttpServletRequest)
context.get("request"));
writer.append(HtmlWidgetRenderer.beginNamedBorder("Template", location,
request.getContextPath()));
}
@@ -180,7 +180,7 @@ public class HtmlWidget extends ModelScreenWidget {
}
FreeMarkerWorker.renderTemplate(template, context, writer);
- if (!location.endsWith(".fo.ftl") &&
HtmlWidgetRenderer.NAMED_BORDER_TYPE != ModelWidget.NamedBorderType.NONE) {
+ if (HtmlWidgetRenderer.NAMED_BORDER_TYPE !=
ModelWidget.NamedBorderType.NONE && !location.endsWith(".fo.ftl")) {
writer.append(HtmlWidgetRenderer.endNamedBorder("Template", location));
}
if (insertWidgetBoundaryComments) {
