[ofbiz-framework] branch trunk updated: Improved: Apply multi-block attr to each application (OFBIZ-11706)

[James Yong-2]

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 767390a  Improved: Apply multi-block attr to each application (OFBIZ-11706)
767390a is described below

commit 767390ad890b2619b2d3ef7a8dfc628dc3ca2d11
Author: James Yong <[hidden email]>
AuthorDate: Sat May 23 14:08:35 2020 +0800

    Improved: Apply multi-block attr to each application (OFBIZ-11706)
   
    1. Bug Fix
    2. Disable multi-block until function is stabilized.
---
 .../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 221bd85..36d4742 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
@@ -208,7 +208,7 @@ public class HtmlWidget extends ModelScreenWidget {
         @Override
         public void renderWidgetString(Appendable writer, Map<String, Object> context, ScreenStringRenderer screenStringRenderer) throws IOException {
 
-            if (isMultiBlock()) {
+            if (false && isMultiBlock()) {
 
                 StringWriter stringWriter = new StringWriter();
                 context.put("MultiBlockWriter", stringWriter);
@@ -250,7 +250,7 @@ public class HtmlWidget extends ModelScreenWidget {
                 }
 
                 // check for external script
-                String externalScripts = doc.head().select("script").toString();
+                String externalScripts = doc.body().select("script").toString();
                 writer.append(externalScripts);
 
                 // the 'template' block