[Erp5-report] r35749 nicolas - in /erp5/trunk/products: ERP5/Document/ ERP5OOo/Document/

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri May 28 18:15:38 2010
New Revision: 35749

URL: http://svn.erp5.org?rev=35749&view=rev
Log:
All convert() methods become _convert() (private one is real implemtation).
As a reminder convert() aims to check Conversion Format Permission.
remove obsolete security statements


Modified:
    erp5/trunk/products/ERP5/Document/EmailDocument.py
    erp5/trunk/products/ERP5/Document/Image.py
    erp5/trunk/products/ERP5/Document/PDFDocument.py
    erp5/trunk/products/ERP5/Document/TextDocument.py
    erp5/trunk/products/ERP5OOo/Document/OOoDocument.py

Modified: erp5/trunk/products/ERP5/Document/EmailDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/EmailDocument.py?rev=35749&r1=35748&r2=35749&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/EmailDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/EmailDocument.py [utf8] Fri May 28 18:15:38 2010
@@ -427,6 +427,7 @@
     main content (text/plain).
     TODO: add support for legacy objects
     """
+    self._checkConversionFormatPermission(None)
     if not self.hasFile() or self._baseGetTextContent() is not None:
       # Return the standard text content if no file was provided
       # Or standard text content is not empty.

Modified: erp5/trunk/products/ERP5/Document/Image.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Image.py?rev=35749&r1=35748&r2=35749&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Image.py [utf8] Fri May 28 18:15:38 2010
@@ -323,8 +323,7 @@
     return mime_type, result
 
   # Conversion API
-  security.declareProtected(Permissions.AccessContentsInformation, 'convert')
-  def convert(self, format, **kw):
+  def _convert(self, format, **kw):
     """
     Implementation of conversion for Image files
     """

Modified: erp5/trunk/products/ERP5/Document/PDFDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PDFDocument.py?rev=35749&r1=35748&r2=35749&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PDFDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/PDFDocument.py [utf8] Fri May 28 18:15:38 2010
@@ -67,8 +67,7 @@
                     )
 
   # Conversion API
-  security.declareProtected(Permissions.AccessContentsInformation, 'convert')
-  def convert(self, format, **kw):
+  def _convert(self, format, **kw):
     """
     Implementation of conversion for PDF files
     """
@@ -89,7 +88,7 @@
         self.setConversion(data, mime=mime, format='txt')
         return (mime, data)
     else:
-      return Image.convert(self, format, **kw)
+      return Image._convert(self, format, **kw)
 
   security.declareProtected(Permissions.ModifyPortalContent, 'populateContent')
   def populateContent(self):

Modified: erp5/trunk/products/ERP5/Document/TextDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TextDocument.py?rev=35749&r1=35748&r2=35749&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TextDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TextDocument.py [utf8] Fri May 28 18:15:38 2010
@@ -131,8 +131,7 @@
       return self._substituteTextContent(subject, safe_substitute=safe_substitute,
                                          **substitution_method_parameter_dict)
 
-    security.declareProtected(Permissions.AccessContentsInformation, 'convert')
-    def convert(self, format, substitution_method_parameter_dict=None,
+    def _convert(self, format, substitution_method_parameter_dict=None,
                 safe_substitute=True, charset=None, text_content=None, **kw):
       """
         Convert text using portal_transforms or oood
@@ -239,6 +238,7 @@
     def getBaseData(self, default=_MARKER):
       """
       """
+      self._checkConversionFormatPermission(None, **kw)
       if default is _MARKER:
         return self.getTextContent()
       else:

Modified: erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/Document/OOoDocument.py?rev=35749&r1=35748&r2=35749&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] Fri May 28 18:15:38 2010
@@ -262,7 +262,6 @@
     """
     return format in self.getTargetFormatList()
 
-  security.declarePrivate('_convert')
   def _convert(self, format):
     """
       Communicates with server to convert a file 
@@ -305,6 +304,7 @@
     If a conversion is already stored for this format, it is returned
     directly, otherwise the conversion is stored for the next time.
     """
+    self._checkConversionFormatPermission(format, **kw)
     #XXX if document is empty, stop to try to convert.
     #XXX but I don't know what is a appropriate mime-type.(Yusei)
     if not self.hasData():