[Erp5-report] r23424 - /erp5/trunk/products/ERP5Type/DocumentationHelper/

[nobody at svn.erp5.org]

Author: mayoro
Date: Thu Sep  4 17:46:45 2008
New Revision: 23424

URL: http://svn.erp5.org?rev=23424&view=rev
Log:
testing documented object before calling Description()

Modified:
    erp5/trunk/products/ERP5Type/DocumentationHelper/CatalogMethodDocumentationHelper.py
    erp5/trunk/products/ERP5Type/DocumentationHelper/PortalTypeRoleDocumentationHelper.py

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/CatalogMethodDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/CatalogMethodDocumentationHelper.py?rev=23424&r1=23423&r2=23424&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/CatalogMethodDocumentationHelper.py (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/CatalogMethodDocumentationHelper.py Thu Sep  4 17:46:45 2008
@@ -66,10 +66,10 @@
   security.declareProtected(Permissions.AccessContentsInformation, 'getSource' )
   def getSource(self):
     """
-    Returns the source code of the documentation helper
+    Returns the source code the catalog method
     """
     from zLOG import LOG, INFO
-    source_code =  getattr(self.getDocumentedObject(), 'src', '')
+    source_code = getattr(self.getDocumentedObject(), 'src', '')
     portal_transforms = getattr(self, 'portal_transforms', None)
     if portal_transforms is not None:
       REQUEST = getattr(self, 'REQUEST', None)

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/PortalTypeRoleDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/PortalTypeRoleDocumentationHelper.py?rev=23424&r1=23423&r2=23424&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/PortalTypeRoleDocumentationHelper.py (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/PortalTypeRoleDocumentationHelper.py Thu Sep  4 17:46:45 2008
@@ -44,7 +44,11 @@
 
   security.declareProtected(Permissions.AccessContentsInformation, 'getDescription')
   def getDescription(self):
-    return self.getDocumentedObject().Description()
+    documented_object = self.getDocumentedObject()
+    if documented_object is not None:
+      return documented_object.Description()
+    else:
+      return ''
 
   security.declareProtected(Permissions.AccessContentsInformation, 'getType' )
   def getType(self):