From f87fb7097fb17309c32f06d65cc8e4feccdbbf4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Fri, 11 Sep 2009 08:13:18 +0000
Subject: [PATCH] erp5_sql_deferred_connection_string must match
 erp5_sql_connection_string, but erp5_sql_deferred_connection_type must be a
 deferred connection

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28920 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/ERP5/ERP5Site.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/product/ERP5/ERP5Site.py b/product/ERP5/ERP5Site.py
index 12bd7bfa20..897317a9d9 100644
--- a/product/ERP5/ERP5Site.py
+++ b/product/ERP5/ERP5Site.py
@@ -65,6 +65,8 @@ def manage_addERP5Site(self,
                        erp5_catalog_storage='',
                        erp5_sql_connection_type='Z MySQL Database Connection',
                        erp5_sql_connection_string='test test',
+                       erp5_sql_deferred_connection_type=\
+                           'Z MySQL Deferred Database Connection',
                        cmf_activity_sql_connection_type= \
                            'Z MySQL Database Connection',
                        cmf_activity_sql_connection_string='test test',
@@ -82,6 +84,7 @@ def manage_addERP5Site(self,
                  erp5_catalog_storage,
                  erp5_sql_connection_type,
                  erp5_sql_connection_string,
+                 erp5_sql_deferred_connection_type,
                  cmf_activity_sql_connection_type,
                  cmf_activity_sql_connection_string,
                  create_activities=create_activities,
@@ -1218,6 +1221,7 @@ class ERP5Generator(PortalGenerator):
              erp5_catalog_storage,
              erp5_sql_connection_type,
              erp5_sql_connection_string,
+             erp5_sql_deferred_connection_type,
              cmf_activity_sql_connection_type,
              cmf_activity_sql_connection_string,
              create_activities=1,
@@ -1232,7 +1236,6 @@ class ERP5Generator(PortalGenerator):
     # Return the fully wrapped object.
     p = parent.this()._getOb(id)
 
-    erp5_sql_deferred_connection_type = erp5_sql_connection_type
     erp5_sql_deferred_connection_string = erp5_sql_connection_string
     p._setProperty('erp5_catalog_storage',
                    erp5_catalog_storage, 'string')
-- 
2.30.9