From 83303fb6c705a4825dfbc08fef5017daa234c89c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Mon, 1 Sep 2008 13:10:56 +0000
Subject: [PATCH] improve a bit the failure notification message

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23319 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/CMFActivity/ActivityTool.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/product/CMFActivity/ActivityTool.py b/product/CMFActivity/ActivityTool.py
index 20d75cdfdb..731ef71de5 100644
--- a/product/CMFActivity/ActivityTool.py
+++ b/product/CMFActivity/ActivityTool.py
@@ -289,6 +289,11 @@ class Message:
     portal = activity_tool.getPortalObject()
     user_email = portal.getProperty('email_to_address',
                        portal.getProperty('email_from_address'))
+
+    call_traceback = ''
+    if self.call_traceback:
+      call_traceback = 'Created at:\n%s' % self.call_traceback
+
     mail_text = """From: %s
 To: %s
 Subject: %s
@@ -298,9 +303,8 @@ Subject: %s
 Server: %s
 Document: %s
 Method: %s
-Arguments:%r
-Named Parameters:%r
-Created at:
+Arguments: %r
+Named Parameters: %r
 %s
 
 Exception: %s %s
@@ -309,8 +313,7 @@ Exception: %s %s
 """ % (activity_tool.email_from_address, user_email, message, message,
        self.request_info.get('SERVER_URL', ''),
        '/'.join(self.object_path), self.method_id, self.args, self.kw,
-       self.call_traceback,
-       self.exc_type, self.exc_value, self.traceback)
+       call_traceback, self.exc_type, self.exc_value, self.traceback)
     try:
       activity_tool.MailHost.send( mail_text )
     except (socket.error, MailHostError), message:
-- 
2.30.9