Commit f87fb709 authored by Jérome Perrin's avatar Jérome Perrin

erp5_sql_deferred_connection_string must match erp5_sql_connection_string, but...

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
parent 6b0b5891
...@@ -65,6 +65,8 @@ def manage_addERP5Site(self, ...@@ -65,6 +65,8 @@ def manage_addERP5Site(self,
erp5_catalog_storage='', erp5_catalog_storage='',
erp5_sql_connection_type='Z MySQL Database Connection', erp5_sql_connection_type='Z MySQL Database Connection',
erp5_sql_connection_string='test test', erp5_sql_connection_string='test test',
erp5_sql_deferred_connection_type=\
'Z MySQL Deferred Database Connection',
cmf_activity_sql_connection_type= \ cmf_activity_sql_connection_type= \
'Z MySQL Database Connection', 'Z MySQL Database Connection',
cmf_activity_sql_connection_string='test test', cmf_activity_sql_connection_string='test test',
...@@ -82,6 +84,7 @@ def manage_addERP5Site(self, ...@@ -82,6 +84,7 @@ def manage_addERP5Site(self,
erp5_catalog_storage, erp5_catalog_storage,
erp5_sql_connection_type, erp5_sql_connection_type,
erp5_sql_connection_string, erp5_sql_connection_string,
erp5_sql_deferred_connection_type,
cmf_activity_sql_connection_type, cmf_activity_sql_connection_type,
cmf_activity_sql_connection_string, cmf_activity_sql_connection_string,
create_activities=create_activities, create_activities=create_activities,
...@@ -1218,6 +1221,7 @@ class ERP5Generator(PortalGenerator): ...@@ -1218,6 +1221,7 @@ class ERP5Generator(PortalGenerator):
erp5_catalog_storage, erp5_catalog_storage,
erp5_sql_connection_type, erp5_sql_connection_type,
erp5_sql_connection_string, erp5_sql_connection_string,
erp5_sql_deferred_connection_type,
cmf_activity_sql_connection_type, cmf_activity_sql_connection_type,
cmf_activity_sql_connection_string, cmf_activity_sql_connection_string,
create_activities=1, create_activities=1,
...@@ -1232,7 +1236,6 @@ class ERP5Generator(PortalGenerator): ...@@ -1232,7 +1236,6 @@ class ERP5Generator(PortalGenerator):
# Return the fully wrapped object. # Return the fully wrapped object.
p = parent.this()._getOb(id) p = parent.this()._getOb(id)
erp5_sql_deferred_connection_type = erp5_sql_connection_type
erp5_sql_deferred_connection_string = erp5_sql_connection_string erp5_sql_deferred_connection_string = erp5_sql_connection_string
p._setProperty('erp5_catalog_storage', p._setProperty('erp5_catalog_storage',
erp5_catalog_storage, 'string') erp5_catalog_storage, 'string')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment