From 43fb9e88e11683b1c4487e64b6e216a02b3426c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Thu, 11 Dec 2008 15:36:23 +0000
Subject: [PATCH] don't activate "deliver" on bug line, pass transition
 immediatly, otherwise some conflict error may occur (and the notification
 message may be sent twice)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24867 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.xml | 2 +-
 .../portal_workflow/bug_event_workflow/transitions/start.xml  | 4 ++--
 bt5/erp5_forge/bt/revision                                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.xml
index 04031dd399..b354ad6844 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.xml
@@ -131,8 +131,8 @@ for to_url in to_url_list:\n
   # Bug Message not send email it self.\n
   #context.activate(activity=\'SQLQueue\').sendMailHostMessage(mail_message)\n
   \n
-context.activate(activity=\'SQLQueue\').deliver()\n
 context.setData(mail_message)\n
+context.deliver()\n
 \n
 if download:\n
   return mail_message\n
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start.xml
index 79a1d2baf5..fb2c1b4614 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start.xml
@@ -23,7 +23,7 @@
         </item>
         <item>
             <key> <string>after_script_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>BugEvent_buildMessage</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -45,7 +45,7 @@
         </item>
         <item>
             <key> <string>script_name</string> </key>
-            <value> <string>BugEvent_buildMessage</string> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision
index 1e59c84a3a..b14de3adc4 100644
--- a/bt5/erp5_forge/bt/revision
+++ b/bt5/erp5_forge/bt/revision
@@ -1 +1 @@
-420
\ No newline at end of file
+421
\ No newline at end of file
-- 
2.30.9