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

[nobody at svn.erp5.org]

Author: mayoro
Date: Sat Oct 11 16:33:11 2008
New Revision: 24153

URL: http://svn.erp5.org?rev=24153&view=rev
Log:
adding description in documentation of ERP5 Form

Modified:
    erp5/trunk/products/ERP5Type/DocumentationHelper/ERP5FormDocumentationHelper.py
    erp5/trunk/products/ERP5Type/DocumentationHelper/PageTemplateDocumentationHelper.py
    erp5/trunk/products/ERP5Type/DocumentationHelper/SkinFolderDocumentationHelper.py

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/ERP5FormDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/ERP5FormDocumentationHelper.py?rev=24153&r1=24152&r2=24153&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/ERP5FormDocumentationHelper.py (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/ERP5FormDocumentationHelper.py Sat Oct 11 16:33:11 2008
@@ -70,4 +70,11 @@
     """
     return getattr(self.getDocumentedObject(), "encoding", '')
 
+  security.declareProtected(Permissions.AccessContentsInformation, 'getDescription' )
+  def getDescription(self):
+    """
+    Returns the description of the documentation helper
+    """
+    return getattr(self.getDocumentedObject(), "description", '')
+
 InitializeClass(ERP5FormDocumentationHelper)

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/PageTemplateDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/PageTemplateDocumentationHelper.py?rev=24153&r1=24152&r2=24153&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/PageTemplateDocumentationHelper.py (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/PageTemplateDocumentationHelper.py Sat Oct 11 16:33:11 2008
@@ -84,7 +84,7 @@
       REQUEST = getattr(self, 'REQUEST', None)
       if REQUEST is not None:
         if REQUEST.get('portal_skin', 'View' ) != 'View':
-          return getattr(self.getDocumentedObject(), "description", '')
+          return source_code
     else:
       LOG('DCWorkflowScriptDocumentationHelper', INFO,
           'Transformation Tool is not installed. No convertion of python script to html')

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/SkinFolderDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/SkinFolderDocumentationHelper.py?rev=24153&r1=24152&r2=24153&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/SkinFolderDocumentationHelper.py (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/SkinFolderDocumentationHelper.py Sat Oct 11 16:33:11 2008
@@ -140,7 +140,10 @@
     if files is not None:
       for file in files.objectValues():
         if not meta_type or file.meta_type == meta_type:
-          file_list.append((file.id, file.title, file.meta_type))
+          file_list.append((file.id, 
+                            getattr(file, "title", ""), 
+                            getattr(file, "description", ""),
+                            getattr(file, "meta_type", "")))
     return file_list
   security.declareProtected( Permissions.AccessContentsInformation, 'getFileURIList' )
   def getFileURIList(self, meta_type=None):