[Erp5-report] r20642 - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: alex
Date: Fri Apr 18 11:57:47 2008
New Revision: 20642

URL: http://svn.erp5.org?rev=20642&view=rev
Log:
Use _ViewEmulator in _setCacheHeaders, as it expects an action, not an object

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

Modified: erp5/trunk/products/ERP5/Document/EmailDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/EmailDocument.py?rev=20642&r1=20641&r2=20642&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/EmailDocument.py (original)
+++ erp5/trunk/products/ERP5/Document/EmailDocument.py Fri Apr 18 11:57:47 2008
@@ -34,7 +34,7 @@
 from AccessControl import ClassSecurityInfo, Unauthorized
 from Products.ERP5Type.Base import WorkflowMethod
 from Products.CMFCore.utils import getToolByName, _checkPermission
-from Products.CMFCore.utils import _setCacheHeaders
+from Products.CMFCore.utils import _setCacheHeaders, _ViewEmulator
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5.Document.TextDocument import TextDocument
 from Products.ERP5.Document.File import File
@@ -307,7 +307,7 @@
       Convert text using portal_transforms
     """
     # Accelerate rendering in Web mode
-    _setCacheHeaders(self, {'format' : format})
+    _setCacheHeaders(_ViewEmulator().__of__(self), {'format' : format})
     # Return the raw content
     if format == 'raw':
       return 'text/plain', self.getTextContent()

Modified: erp5/trunk/products/ERP5/Document/Image.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Image.py?rev=20642&r1=20641&r2=20642&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py (original)
+++ erp5/trunk/products/ERP5/Document/Image.py Fri Apr 18 11:57:47 2008
@@ -39,7 +39,7 @@
 from Acquisition import aq_base
 
 from DocumentTemplate.DT_Util import html_quote
-from Products.CMFCore.utils import _setCacheHeaders
+from Products.CMFCore.utils import _setCacheHeaders, _ViewEmulator
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5.Document.File import File
 from Products.ERP5.Document.Document import ConversionError
@@ -333,8 +333,8 @@
       """Return the image data."""
       self._upradeImage()
 
-      _setCacheHeaders(self, dict(display=display, format=format, quality=quality, 
-                                  resolution=resolution, frame=frame))
+      _setCacheHeaders(_ViewEmulator().__of__(self), dict(display=display,
+          format=format, quality=quality, resolution=resolution, frame=frame))
 
       # display may be set from a cookie (?)
       if (display is not None or resolution is not None or quality != 75 or format != ''\

Modified: erp5/trunk/products/ERP5/Document/TextDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TextDocument.py?rev=20642&r1=20641&r2=20642&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TextDocument.py (original)
+++ erp5/trunk/products/ERP5/Document/TextDocument.py Fri Apr 18 11:57:47 2008
@@ -29,7 +29,7 @@
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type.Base import WorkflowMethod
 from Products.CMFCore.utils import getToolByName
-from Products.CMFCore.utils import _setCacheHeaders
+from Products.CMFCore.utils import _setCacheHeaders, _ViewEmulator
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5.Document.Document import Document
 from Products.ERP5Type.WebDAVSupport import TextContent
@@ -150,7 +150,7 @@
         Convert text using portal_transforms
       """
       # Accelerate rendering in Web mode
-      _setCacheHeaders(self, {'format' : format})
+      _setCacheHeaders(_ViewEmulator().__of__(self), {'format' : format})
       # Return the raw content
       if format == 'raw':
         return 'text/plain', self.getTextContent()
@@ -171,7 +171,7 @@
         return mime_type, ''
 
     def __call__(self):
-      _setCacheHeaders(self, {})
+      _setCacheHeaders(_ViewEmulator().__of__(self), {})
       return Document.__call__(self)
 
     security.declareProtected(Permissions.AccessContentsInformation, 'getContentBaseURL')