no longer allow to select different connection strings for normal and deferred...

no longer allow to select different connection strings for normal and deferred connections, because both must use the same database

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28891 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/ERP5Site.py

@@ -65,9 +65,6 @@ 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',
-                       erp5_sql_deferred_connection_string = 'test test',
                        cmf_activity_sql_connection_type= \
                            'Z MySQL Database Connection',
                        cmf_activity_sql_connection_string='test test',
@@ -85,8 +82,6 @@ def manage_addERP5Site(self,
                  erp5_catalog_storage,
                  erp5_sql_connection_type,
                  erp5_sql_connection_string,
-                 erp5_sql_deferred_connection_type,
-                 erp5_sql_deferred_connection_string,
                  cmf_activity_sql_connection_type,
                  cmf_activity_sql_connection_string,
                  create_activities=create_activities,
@@ -1223,8 +1218,6 @@ class ERP5Generator(PortalGenerator):
              erp5_catalog_storage,
              erp5_sql_connection_type,
              erp5_sql_connection_string,
-             erp5_sql_deferred_connection_type,
-             erp5_sql_deferred_connection_string,
              cmf_activity_sql_connection_type,
              cmf_activity_sql_connection_string,
              create_activities=1,
@@ -1238,6 +1231,9 @@ class ERP5Generator(PortalGenerator):
     parent._setObject(id, portal)
     # 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')
     p._setProperty('erp5_sql_connection_type',

product/ERP5/dtml/addERP5Site.dtml

@@ -93,10 +93,6 @@ label {
       <label class="form-label" for="erp5_sql_connection_string">ERP5 Database</label>
       <input class="form-element" name="erp5_sql_connection_string" id="erp5_sql_connection_string" type="text" size="40" value="test test"/>
     </div>
-    <div>
-      <label class="form-label" for="erp5_sql_deferred_connection_string">ERP5 Deferred Database</label>
-      <input class="form-element" name="erp5_sql_deferred_connection_string" id="erp5_sql_deferred_connection_string" type="text" size="40" value="test test"/>
-    </div>
     <div>
       <label class="form-label" for="cmf_activity_sql_connection_string">CMF Activity Database</label>
       <input class="form-element" name="cmf_activity_sql_connection_string" id="cmf_activity_sql_connection_string" type="text" size="40" value="test test"/>