[ofbiz-framework] branch trunk updated: Fixed: showHelp not working (OFBIZ-11803)

[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 3a13afe  Fixed: showHelp not working (OFBIZ-11803)
3a13afe is described below

commit 3a13afe81170fc2de75d0b83cb9d45955cb6167c
Author: James Yong <jamesy...@apache.org>
AuthorDate: Thu Jun 18 23:29:02 2020 +0800

    Fixed: showHelp not working (OFBIZ-11803)
    
    Cater for page that uses layoutSettings.VT_STYLESHEET
    instead of layoutSettings.styleSheets
---
 .../java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
index 12dce33..21adeb5 100644
--- 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
+++ 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
@@ -208,7 +208,8 @@ public final class MultiBlockHtmlTemplateUtil {
             return;
         }
         List<String> layoutSettingsStyleSheets = 
UtilGenerics.cast(layoutSettings.get("styleSheets"));
-        if (UtilValidate.isEmpty(layoutSettingsStyleSheets)) {
+        if (UtilValidate.isEmpty(layoutSettingsStyleSheets)
+                && UtilValidate.isEmpty(layoutSettings.get("VT_STYLESHEET"))) {
             return;
         }
         // ensure initTheme.groovy has run.