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

[nobody at svn.erp5.org]

Author: mayoro
Date: Sat Aug 23 02:54:29 2008
New Revision: 23132

URL: http://svn.erp5.org?rev=23132&view=rev
Log:
- Avoid displaying None when description is not define in ClassMethodDocumentationHelper
- When portal_skin if different to view mode, do not use portal_transform for displaying python source code 

Modified:
    erp5/trunk/products/ERP5Type/DocumentationHelper/ClassMethodDocumentationHelper.py
    erp5/trunk/products/ERP5Type/DocumentationHelper/PageTemplateDocumentationHelper.py
    erp5/trunk/products/ERP5Type/DocumentationHelper/PortalTypePropertySheetDocumentationHelper.py
    erp5/trunk/products/ERP5Type/DocumentationHelper/ScriptPythonDocumentationHelper.py

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/ClassMethodDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/ClassMethodDocumentationHelper.py?rev=23132&r1=23131&r2=23132&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/ClassMethodDocumentationHelper.py (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/ClassMethodDocumentationHelper.py Sat Aug 23 02:54:29 2008
@@ -42,7 +42,7 @@
 
   security.declareProtected(Permissions.AccessContentsInformation, 'getDescription')
   def getDescription(self):
-    return self.getDocumentedObject().__doc__
+    return getattr(self.getDocumentedObject(), "__doc__", '')
 
   security.declareProtected( Permissions.AccessContentsInformation, 'getType' )
   def getType(self):
@@ -56,7 +56,7 @@
     """
     Returns the type of the documentation helper
     """
-    return self.getDocumentedObject().__name__
+    return getattr(self.getDocumentedObject(), "__doc__", '')
 
   security.declareProtected(Permissions.AccessContentsInformation, 'getSectionList')
   def getSectionList(self):

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/PageTemplateDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/PageTemplateDocumentationHelper.py?rev=23132&r1=23131&r2=23132&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/PageTemplateDocumentationHelper.py (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/PageTemplateDocumentationHelper.py Sat Aug 23 02:54:29 2008
@@ -72,7 +72,12 @@
     from zLOG import LOG, INFO
     source_code = getattr(self.getDocumentedObject(), "_text", '')
     portal_transforms = getattr(self, 'portal_transforms', None)
-    if portal_transforms is None:
+    if portal_transforms is not None:
+      REQUEST = getattr(self, 'REQUEST', None)
+      if REQUEST is not None:
+        if REQUEST.get('portal_skin', 'View' ) != 'View':
+          return source_code
+    else:
       LOG('DCWorkflowScriptDocumentationHelper', INFO,
           'Transformation Tool is not installed. No convertion of python script to html')
       return source_code

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/PortalTypePropertySheetDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/PortalTypePropertySheetDocumentationHelper.py?rev=23132&r1=23131&r2=23132&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/PortalTypePropertySheetDocumentationHelper.py (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/PortalTypePropertySheetDocumentationHelper.py Sat Aug 23 02:54:29 2008
@@ -76,13 +76,20 @@
       property_sheet_file.seek(0)
       source_code = property_sheet_file.read()
       portal_transforms = getattr(self, 'portal_transforms', None)
-      if portal_transforms is None:
+      if portal_transforms is not None:
+        REQUEST = getattr(self, 'REQUEST', None)
+        if REQUEST is not None:
+          if REQUEST.get('portal_skin', 'View' ) != 'View':
+            return source_code
+      else:
         LOG('DCWorkflowScriptDocumentationHelper', INFO,
-          'Transformation Tool is not installed. No convertion of python script to html')
+            'Transformation Tool is not installed. No convertion of python script to html')
         return source_code
     src_mimetype='text/x-python'
     mime_type = 'text/html'
     source_html = portal_transforms.convertTo(mime_type, source_code, mimetype = src_mimetype)
     return source_html.getData()
 
+
+
 InitializeClass(PortalTypePropertySheetDocumentationHelper)

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/ScriptPythonDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/ScriptPythonDocumentationHelper.py?rev=23132&r1=23131&r2=23132&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/ScriptPythonDocumentationHelper.py (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/ScriptPythonDocumentationHelper.py Sat Aug 23 02:54:29 2008
@@ -71,7 +71,12 @@
     from zLOG import LOG, INFO
     source_code = getattr(self.getDocumentedObject(), "_body", '')
     portal_transforms = getattr(self, 'portal_transforms', None)
-    if portal_transforms is None:
+    if portal_transforms is not None:
+      REQUEST = getattr(self, 'REQUEST', None)
+      if REQUEST is not None:
+        if REQUEST.get('portal_skin', 'View' ) != 'View':
+          return source_code
+    else:
       LOG('DCWorkflowScriptDocumentationHelper', INFO,
           'Transformation Tool is not installed. No convertion of python script to html')
       return source_code