[Erp5-report] r42747 nicolas - /erp5/trunk/products/ERP5OOo/OOoTemplate.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Jan 28 16:11:15 2011
New Revision: 42747

URL: http://svn.erp5.org?rev=42747&view=rev
Log:
Stop overriding pt_edit for Zope version greater that 2.8 as ZopePageTemplate.pt_edit
is bug free and does more pretty things like calling ZCacheable_invalidate.


Modified:
    erp5/trunk/products/ERP5OOo/OOoTemplate.py

Modified: erp5/trunk/products/ERP5OOo/OOoTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/OOoTemplate.py?rev=42747&r1=42746&r2=42747&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/OOoTemplate.py [utf8] Fri Jan 28 16:11:15 2011
@@ -258,13 +258,19 @@ class OOoTemplate(ZopePageTemplate):
       file = builder.prepareContentXml(self.ooo_xml_file_id)
     return ZopePageTemplate.pt_upload(self, REQUEST, file)
 
-  security.declareProtected('Change Page Templates', 'pt_edit')
-  def pt_edit(self, text, content_type):
-    if content_type:
-      self.content_type = str(content_type)
-    if hasattr(text, 'read'):
-      text = text.read()
-    self.write(text)
+  if 'pt_edit' not in ZopePageTemplate.__dict__:
+    # Override it only for 2.8 !
+    # ZopePageTemplate v.2.8 inherate pt_edit from
+    # PageTemplate. If method is defined on ZopePageTemplate
+    # means we are under 2.12.
+    # Delete me when we drop support of 2.8
+    security.declareProtected('Change Page Templates', 'pt_edit')
+    def pt_edit(self, text, content_type):
+      if content_type:
+        self.content_type = str(content_type)
+      if hasattr(text, 'read'):
+        text = text.read()
+      self.write(text)
 
   security.declareProtected('Change Page Templates', 'doSettings')
   def doSettings(self, REQUEST, title, xml_file_id, ooo_stylesheet, script_name=None):