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

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Sep 9 14:58:35 CEST 2008


Author: mayoro
Date: Tue Sep  9 14:58:32 2008
New Revision: 23511

URL: http://svn.erp5.org?rev=23511&view=rev
Log:
- restriction in the list of business templates returned to those selected by the user in documentation
- changing the source mime-type from python script to text/plain for z_sql_methods and catalog_methods

Modified:
    erp5/trunk/products/ERP5Type/DocumentationHelper/CatalogMethodDocumentationHelper.py
    erp5/trunk/products/ERP5Type/DocumentationHelper/ERP5SiteDocumentationHelper.py
    erp5/trunk/products/ERP5Type/DocumentationHelper/ZSQLMethodDocumentationHelper.py

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/CatalogMethodDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/CatalogMethodDocumentationHelper.py?rev=23511&r1=23510&r2=23511&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/CatalogMethodDocumentationHelper.py (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/CatalogMethodDocumentationHelper.py Tue Sep  9 14:58:32 2008
@@ -80,7 +80,7 @@
       LOG('DCWorkflowScriptDocumentationHelper', INFO,
           'Transformation Tool is not installed. No convertion of python script to html')
       return source_code
-    src_mimetype='text/x-python'
+    src_mimetype='text/plain'
     mime_type = 'text/html'
     source_html = portal_transforms.convertTo(mime_type, source_code, mimetype = src_mimetype)
     return source_html.getData()

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/ERP5SiteDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/ERP5SiteDocumentationHelper.py?rev=23511&r1=23510&r2=23511&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/ERP5SiteDocumentationHelper.py (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/ERP5SiteDocumentationHelper.py Tue Sep  9 14:58:32 2008
@@ -84,13 +84,17 @@
   def getBusinessTemplateItemList(self):
     """
     """
+    REQUEST = getattr(self, 'REQUEST', None)
+    business_template_list = [bt.getTitle() for bt in self.getDocumentedObject().portal_templates.objectValues()]
+    if REQUEST is not None:
+      business_template_list = REQUEST.get("business_template_list", [])
     return [(bt.getId(),
               getattr(bt, "title", ''),
               getattr(bt, "description", ''),
               getattr(bt, "version", ''),
               getattr(bt, "revision", ''))
             for bt in self.getDocumentedObject().portal_templates.objectValues()
-            if bt.getInstallationState() == 'installed']
+            if bt.getInstallationState() == 'installed' and bt.getTitle() in business_template_list]
 
   security.declareProtected( Permissions.AccessContentsInformation, 'getBusinessTemplateURIList' )
   def getBusinessTemplateURIList(self):

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/ZSQLMethodDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/ZSQLMethodDocumentationHelper.py?rev=23511&r1=23510&r2=23511&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/ZSQLMethodDocumentationHelper.py (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/ZSQLMethodDocumentationHelper.py Tue Sep  9 14:58:32 2008
@@ -80,7 +80,7 @@
       LOG('DCWorkflowScriptDocumentationHelper', INFO,
           'Transformation Tool is not installed. No convertion of python script to html')
       return source_code
-    src_mimetype='text/x-python'
+    src_mimetype='text/plain'
     mime_type = 'text/html'
     source_html = portal_transforms.convertTo(mime_type, source_code, mimetype = src_mimetype)
     return source_html.getData()




More information about the Erp5-report mailing list