[Erp5-report] r28891 - in /erp5/trunk/products/ERP5: ERP5Site.py dtml/addERP5Site.dtml

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Sep 10 11:58:37 2009
New Revision: 28891

URL: http://svn.erp5.org?rev=28891&view=rev
Log:
no longer allow to select different connection strings for normal and deferred connections, because both must use the same database

Modified:
    erp5/trunk/products/ERP5/ERP5Site.py
    erp5/trunk/products/ERP5/dtml/addERP5Site.dtml

Modified: erp5/trunk/products/ERP5/ERP5Site.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/ERP5Site.py?rev=28891&r1=28890&r2=28891&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/ERP5Site.py [utf8] (original)
+++ erp5/trunk/products/ERP5/ERP5Site.py [utf8] Thu Sep 10 11:58:37 2009
@@ -65,9 +65,6 @@
                        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 @@
                  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 @@
              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 @@
     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',

Modified: erp5/trunk/products/ERP5/dtml/addERP5Site.dtml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/dtml/addERP5Site.dtml?rev=28891&r1=28890&r2=28891&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/dtml/addERP5Site.dtml [utf8] (original)
+++ erp5/trunk/products/ERP5/dtml/addERP5Site.dtml [utf8] Thu Sep 10 11:58:37 2009
@@ -94,10 +94,6 @@
       <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"/>
     </div>