Commit 136d41ed authored by Ayush Tiwari's avatar Ayush Tiwari

erp5_catalog: Create erp5 catalog while setting up erp5site

parent 7062eeb2
...@@ -1312,14 +1312,14 @@ class ObjectTemplateItem(BaseTemplateItem): ...@@ -1312,14 +1312,14 @@ class ObjectTemplateItem(BaseTemplateItem):
# The id match, but better double check with the meta type # The id match, but better double check with the meta type
# while avoiding the impact of systematic check # while avoiding the impact of systematic check
container_container = portal.unrestrictedTraverse(container_path[:-1]) container_container = portal.unrestrictedTraverse(container_path[:-1])
if container_container.meta_type == 'ERP5 Catalog': if container_container.meta_type == 'Catalog Tool':
container_container.manage_addProduct['ZSQLCatalog'].manage_addSQLCatalog(id=container_path[-1], title='') container_container.newContent(portal_type='Catalog', id=container_path[-1], title='')
# We will have more than 1 objects in portal_catalog as we are
# adding both ERP5Catalog as well as SQLCatalog object here.
# Later on, this should be changed to use only ERP5Catalog object
if len(container_container.objectIds()) >= 1: if len(container_container.objectIds()) >= 1:
container_container.default_sql_catalog_id = container_path[-1] container_container.setDefaultErp5CatalogId(container_path[-1])
container = portal.unrestrictedTraverse(container_path) elif container_container.meta_type == 'ERP5 Catalog':
container_container.manage_addProduct['ZSQLCatalog'].manage_addSQLCatalog(id=container_path[-1], title='')
container_container.default_sql_catalog_id == container_path[-1]
container = portal.unrestrictedTraverse(container_path)
else: else:
raise raise
saved_uid_dict = {} saved_uid_dict = {}
......
...@@ -2107,10 +2107,8 @@ class ERP5Generator(PortalGenerator): ...@@ -2107,10 +2107,8 @@ class ERP5Generator(PortalGenerator):
addERP5Tool(p, 'portal_caches', 'Cache Tool') addERP5Tool(p, 'portal_caches', 'Cache Tool')
addERP5Tool(p, 'portal_memcached', 'Memcached Tool') addERP5Tool(p, 'portal_memcached', 'Memcached Tool')
# Add ERP5 SQL Catalog Tool # Add erp5 catalog tool
addTool = p.manage_addProduct['ERP5Catalog'].manage_addTool addERP5Tool(p, 'portal_catalog', 'Catalog Tool')
if not p.hasObject('portal_catalog'):
addTool('ERP5 Catalog', None)
sql_reset = kw.get('sql_reset', 0) sql_reset = kw.get('sql_reset', 0)
def addSQLConnection(id, title, **kw): def addSQLConnection(id, title, **kw):
......
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