[Erp5-report] r18626 - /erp5/trunk/products/ERP5/Document/MailMessage.py

[nobody at svn.erp5.org]

Author: aurel
Date: Tue Jan  8 11:02:38 2008
New Revision: 18626

URL: http://svn.erp5.org?rev=18626&view=rev
Log:
add compatibility for former mail message

Modified:
    erp5/trunk/products/ERP5/Document/MailMessage.py

Modified: erp5/trunk/products/ERP5/Document/MailMessage.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/MailMessage.py?rev=18626&r1=18625&r2=18626&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/MailMessage.py (original)
+++ erp5/trunk/products/ERP5/Document/MailMessage.py Tue Jan  8 11:02:38 2008
@@ -37,6 +37,8 @@
 import smtplib
 
 from zLOG import LOG
+
+_MARKER = []
 
 class MailMessage(Event, CMFMailInMessage):
   """
@@ -109,3 +111,18 @@
       header += "\n"
       msg = header + msg
       self.MailHost.send( msg )
+
+
+  security.declareProtected(Permissions.AccessContentsInformation, 'getTextContent')
+  def getTextContent(self, default=_MARKER):
+    """
+    Overload EmailDocument method to add backward compatibility layer
+    """
+    if getattr(self, 'body', None) is not None:
+      return self.getBody(default)
+    else:
+      if default is _MARKER:
+        return Event.getTextContent(self)
+      else:
+        return Event.getTextContent(self, default)
+