From 6f99c42b754b9b5836f7dc22d8b7e12aff52df22 Mon Sep 17 00:00:00 2001
From: Vincent Desmares <vincentd@nexedi.com>
Date: Tue, 12 May 2009 13:43:39 +0000
Subject: [PATCH] Vincent D. Update redirections to the registration script
 with WebSite_viewRegistrationDialog.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26934 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../SaleOrder_confirmShopping.xml             | 27 +++----------------
 .../SaleOrder_finalizeShopping.xml            | 27 +++----------------
 bt5/erp5_commerce/bt/revision                 |  2 +-
 3 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_confirmShopping.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_confirmShopping.xml
index 6ee92eb71b..1d92993db8 100644
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_confirmShopping.xml
+++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_confirmShopping.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
@@ -158,12 +149,6 @@
               </list>
             </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -211,7 +196,7 @@ translateString = context.Base_translateString\n
 if isAnon:\n
   ## create first an account for user\n
   msg = translateString("You need to create an account to continue If you already have please login.")\n
-  context.Base_redirect(\'WebSite_createWebSiteAccountForm\', \\\n
+  context.Base_redirect(\'WebSite_viewRegistrationDialog\', \\\n
                       keep_items={\'editable_mode\': 1,\n
                                   \'portal_status_message\': msg})\n
 else:\n
@@ -225,12 +210,6 @@ else:\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_finalizeShopping.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_finalizeShopping.xml
index 33a5ebb56f..158fcea1d3 100644
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_finalizeShopping.xml
+++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_finalizeShopping.xml
@@ -3,21 +3,12 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>Script_magic</string> </key>
             <value> <int>3</int> </value>
@@ -158,12 +149,6 @@
               </list>
             </value>
         </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_bind_names</string> </key>
             <value>
@@ -218,7 +203,7 @@ customer = context.SaleOrder_getShoppingCartCustomer()\n
 if isAnon:\n
   ## create first an account for user\n
   msg = translateString("You need to create an account to continue If you already have please login.")\n
-  context.Base_redirect(\'WebSite_createWebSiteAccountForm\', \\\n
+  context.Base_redirect(\'WebSite_viewRegistrationDialog\', \\\n
                         keep_items={\'portal_status_message\': msg,\n
                                     \'editable_mode\': 1})\n
   return\n
@@ -256,12 +241,6 @@ context.Base_redirect(\'SaleOrder_viewThankYouMessage\')\n
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
diff --git a/bt5/erp5_commerce/bt/revision b/bt5/erp5_commerce/bt/revision
index 3fdc173dab..d800886d9c 100644
--- a/bt5/erp5_commerce/bt/revision
+++ b/bt5/erp5_commerce/bt/revision
@@ -1 +1 @@
-122
\ No newline at end of file
+123
\ No newline at end of file
-- 
2.30.9