From ccf50bae1eade04829859705cc9660c1dc6c8355 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Tue, 10 Jun 2008 14:21:11 +0000
Subject: [PATCH] Remove unreferenced mapping variables. Call workflow
 transition after editing the object (because workflow could remove write
 permission on object)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21471 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_skins/erp5_crm/PersonModule_newEvent.xml    | 10 +++++-----
 bt5/erp5_crm/bt/revision                               |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_newEvent.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_newEvent.xml
index 57cb7db9f6..f277813373 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_newEvent.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_newEvent.xml
@@ -100,14 +100,14 @@ if not single_event:\n
       event.setDestinationValue(user_person)\n
       event.receive()\n
     else:\n
-      event.plan()\n
       event.setDestinationValue(person)\n
       event.setSourceValue(user_person)\n
+      event.plan()\n
 else:\n
   if direction == \'incoming\' and len(person_list) > 1:\n
     # This case is not possible\n
-    portal_status_message = translateString("The Single Event option can only be used with outgoing messages",\n
-                                    mapping = dict(portal_type = portal_type, count=count))\n
+    portal_status_message = translateString(\n
+             "The Single Event option can only be used with outgoing messages")\n
     return context.Base_redirect(form_id, keep_items = dict(portal_status_message=portal_status_message, selection_name=selection_name), **kw)\n
   # Proceed to event creation\n
   event = module.newContent(portal_type=portal_type, \n
@@ -115,9 +115,9 @@ else:\n
                             title=title, \n
                             follow_up=follow_up,\n
                             text_content=text_content) # text_format is set by Event_init\n
-  event.plan()\n
   event.setDestinationValueList(person_list)\n
   event.setSourceValue(user_person)\n
+  event.plan()\n
   count = 1\n
 \n
 portal_status_message = translateString("Created and associated ${count} new Events to the selected Ticket.", \n
@@ -191,9 +191,9 @@ context.Base_redirect(form_id, keep_items = dict(portal_status_message=portal_st
                             <string>event</string>
                             <string>_inplacevar_</string>
                             <string>len</string>
-                            <string>dict</string>
                             <string>portal_status_message</string>
                             <string>_apply_</string>
+                            <string>dict</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision
index c390b4cff1..bb81456fa1 100644
--- a/bt5/erp5_crm/bt/revision
+++ b/bt5/erp5_crm/bt/revision
@@ -1 +1 @@
-261
\ No newline at end of file
+262
\ No newline at end of file
-- 
2.30.9