[Erp5-report] r28412 - /erp5/trunk/products/ERP5Type/Core/Folder.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Aug 17 14:06:41 2009
New Revision: 28412

URL: http://svn.erp5.org?rev=28412&view=rev
Log:
call aq_parent's getWebSiteValue or getWebSectionValue only if it exists. thanks to Jérôme and Ivan for notifying this issue.

Modified:
    erp5/trunk/products/ERP5Type/Core/Folder.py

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=28412&r1=28411&r2=28412&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py [utf8] Mon Aug 17 14:06:41 2009
@@ -349,7 +349,11 @@
     specified case (eg. web_site_module/site/fr/web_page_module), we
     call aq_parent instead to reach the Web Site.
     """
-    return aq_parent(self).getWebSiteValue()
+    getWebSiteValue = getattr(aq_parent(self), 'getWebSiteValue', None)
+    if getWebSiteValue is not None:
+      return getWebSiteValue()
+    else:
+      return None
 
   security.declareProtected(Permissions.AccessContentsInformation,
                             'getWebSectionValue')
@@ -359,7 +363,11 @@
     specified case (eg. web_site_module/site/fr/section/web_page_module),
     we call aq_parent instead to reach the Web Section.
     """
-    return aq_parent(self).getWebSectionValue()
+    getWebSectionValue = getattr(aq_parent(self), 'getWebSectionValue', None)
+    if getWebSectionValue is not None:
+      return getWebSectionValue()
+    else:
+      return None
 
 BTREE_HANDLER = 1
 HBTREE_HANDLER = 2