Generic "hasSomething()" accessors test properties against None value, not against empty string.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9297 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Type/Base.py

@@ -2210,11 +2210,11 @@ class Base( CopyContainer, PortalContent, ActiveObject, ERP5PropertyManager ):
     """
     current = self
     # First try to get a container layout
-    if hasattr(current, 'getContainerLayout') and current.hasContainerLayout():
+    if hasattr(current, 'getContainerLayout') and current.getContainerLayout() not in ('', None):
       return current.getContainerLayout()
     # First try to get a content layout
     while current is not None:
-      if hasattr(current, 'hasContentLayout') and current.hasContentLayout():
+      if hasattr(current, 'hasContentLayout') and current.getContentLayout() not in ('', None):
         return current.getContentLayout()
       current = current.getParentValue()
       if not hasattr(current, 'getApplicableLayout'):