svn commit: r1845552 - /ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java

Author: jleroux
Date: Fri Nov  2 08:48:31 2018
New Revision: 1845552

URL: http://svn.apache.org/viewvc?rev=1845552&view=rev
Log:
Fixed: ComponentConfig::getAppBarWebInfos creates infos only for components
without <<app-bar-display="false">>
(OFBIZ-10637)

LoginWorked::getAppBarWebInfos is used to define the apps menus in themes so we
need to also check that no menuName is passed to
ComponentConfig::getAppBarWebInfos. Else all menus appears in the secondary menu
bars

Modified:
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java

Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java?rev=1845552&r1=1845551&r2=1845552&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java Fri Nov  2 08:48:31 2018
@@ -216,7 +216,7 @@ public final class ComponentConfig {
                         } else {
                             tm.put(key, wInfo);
                         }
-                    } if (!wInfo.getAppBarDisplay()) {
+                    } if (!wInfo.getAppBarDisplay() && UtilValidate.isEmpty(menuName)) {
                         tm.put(key, wInfo);
                     }
                 }