[Erp5-report] r24867 - in /erp5/trunk/bt5/erp5_forge: SkinTemplateItem/portal_skins/erp5_fo...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Dec 11 16:36:23 2008
New Revision: 24867

URL: http://svn.erp5.org?rev=24867&view=rev
Log:
don't activate "deliver" on bug line, pass transition immediatly, otherwise some conflict error may occur (and the notification message may be sent twice)

Modified:
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.xml
    erp5/trunk/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start.xml
    erp5/trunk/bt5/erp5_forge/bt/revision

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.xml?rev=24867&r1=24866&r2=24867&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.xml [utf8] Thu Dec 11 16:36:23 2008
@@ -131,8 +131,8 @@
   # 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

Modified: erp5/trunk/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start.xml?rev=24867&r1=24866&r2=24867&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/transitions/start.xml [utf8] Thu Dec 11 16:36:23 2008
@@ -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>

Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=24867&r1=24866&r2=24867&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision [utf8] Thu Dec 11 16:36:23 2008
@@ -1,1 +1,1 @@
-420
+421