[Erp5-report] r6339 - in /erp5/trunk/products/ERP5: ./ bootstrap/erp5_core/PathTemplateItem...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Mar 29 20:36:09 2006
New Revision: 6339

URL: http://svn.erp5.org?rev=6339&view=rev
Log:
don't put SQL Catalog in business template, rather create it while adding an ERP5 Site

Removed:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_catalog/
Modified:
    erp5/trunk/products/ERP5/ERP5Site.py
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_path_list

Modified: erp5/trunk/products/ERP5/ERP5Site.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/ERP5Site.py?rev=6339&r1=6338&r2=6339&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/ERP5Site.py (original)
+++ erp5/trunk/products/ERP5/ERP5Site.py Wed Mar 29 20:36:09 2006
@@ -860,11 +860,14 @@
             addSQLConnection('cmf_activity_sql_connection', 'CMF Activity SQL Server Connection', p.cmf_activity_sql_connection_string)
         elif p.cmf_activity_sql_connection_type == 'Z Gadfly':
           pass
-        # Create default methods in Catalog XXX
+        
         portal_catalog = getToolByName(p, 'portal_catalog')
         if not portal_catalog.getSQLCatalog('erp5_mysql') and not update:
-            # Clear Catalog
-            portal_catalog.manage_catalogClear()
+          # Add a default SQL Catalog
+          addSQLCatalog = portal_catalog.manage_addProduct['ZSQLCatalog']\
+                                          .manage_addSQLCatalog
+          addSQLCatalog('erp5_mysql', '')
+          portal_catalog.default_sql_catalog_id = 'erp5_mysql'
 
         # Add ERP5Form Tools
         addTool = p.manage_addProduct['ERP5Form'].manage_addTool
@@ -879,14 +882,12 @@
           addTool('ERP5 Synchronizations', None)
 
         # Add Message Catalog
-        #if 'Localizer' in p.objectIds():
-          #p._delObject('Localizer') # Why delete it, we should keep for ERP5/CPS
         if not 'Localizer' in p.objectIds():
-          #p._delObject('Localizer') # Why delete it, we should keep for ERP5/CPS
           addLocalizer = p.manage_addProduct['Localizer'].manage_addLocalizer
           addLocalizer('', ('en',))
         localizer = getToolByName(p, 'Localizer')
-        addMessageCatalog = localizer.manage_addProduct['Localizer'].manage_addMessageCatalog
+        addMessageCatalog = localizer.manage_addProduct['Localizer']\
+                                          .manage_addMessageCatalog
         if 'erp5_ui' not in localizer.objectIds():
           if 'default' in localizer.objectIds():
             localizer.manage_delObjects('default')

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_path_list
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_path_list?rev=6339&r1=6338&r2=6339&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_path_list (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_path_list Wed Mar 29 20:36:09 2006
@@ -1,2 +1,1 @@
-portal_catalog/erp5_mysql
 portal_preferences/default_site_preference