Commit ed4eb2d4 authored by Bryton Lacquement's avatar Bryton Lacquement 🚪

Drop CMFDefault's tools

parent 8d7c7dcc
...@@ -1881,19 +1881,13 @@ class PortalGenerator: ...@@ -1881,19 +1881,13 @@ class PortalGenerator:
addCMFCoreTool('CMF Actions Tool', None) addCMFCoreTool('CMF Actions Tool', None)
addCMFCoreTool('CMF Catalog', None) addCMFCoreTool('CMF Catalog', None)
addCMFCoreTool('CMF Member Data Tool', None) addCMFCoreTool('CMF Member Data Tool', None)
addCMFCoreTool('CMF Membership Tool', None)
addCMFCoreTool('CMF Registration Tool', None)
addCMFCoreTool('CMF Skins Tool', None) addCMFCoreTool('CMF Skins Tool', None)
addCMFCoreTool('CMF Undo Tool', None) addCMFCoreTool('CMF Undo Tool', None)
addCMFCoreTool('CMF URL Tool', None) addCMFCoreTool('CMF URL Tool', None)
addCMFCoreTool('CMF Workflow Tool', None) addCMFCoreTool('CMF Workflow Tool', None)
addCMFDefaultTool = p.manage_addProduct['CMFDefault'].manage_addTool
addCMFDefaultTool('Default Discussion Tool', None)
addCMFDefaultTool('Default Membership Tool', None)
addCMFDefaultTool('Default Registration Tool', None)
addCMFDefaultTool('Default Properties Tool', None)
addCMFDefaultTool('Default Metadata Tool', None)
addCMFDefaultTool('Default Syndication Tool', None)
# try to install CMFUid without raising exceptions if not available # try to install CMFUid without raising exceptions if not available
try: try:
addCMFUidTool = p.manage_addProduct['CMFUid'].manage_addTool addCMFUidTool = p.manage_addProduct['CMFUid'].manage_addTool
...@@ -2218,8 +2212,6 @@ class ERP5Generator(PortalGenerator): ...@@ -2218,8 +2212,6 @@ class ERP5Generator(PortalGenerator):
'manage_members')) 'manage_members'))
# actions tool # actions tool
removeActionsFromTool(p.portal_actions, ('folderContents',)) removeActionsFromTool(p.portal_actions, ('folderContents',))
# properties tool
removeActionsFromTool(p.portal_properties, ('configPortal',))
# remove unused action providers # remove unused action providers
for i in ('portal_registration', 'portal_discussion', 'portal_syndication'): for i in ('portal_registration', 'portal_discussion', 'portal_syndication'):
p.portal_actions.deleteActionProvider(i) p.portal_actions.deleteActionProvider(i)
......
...@@ -8,7 +8,7 @@ param = '?ignore_layout:int=1' if int(portal.REQUEST.get('ignore_layout', 0)) el ...@@ -8,7 +8,7 @@ param = '?ignore_layout:int=1' if int(portal.REQUEST.get('ignore_layout', 0)) el
if include_root: if include_root:
result = [{ result = [{
'id' : 'root', 'id' : 'root',
'title' : portal.portal_properties.title(), 'title' : portal.title,
'url' : '%s/view%s' % (portal_url, param), 'url' : '%s/view%s' % (portal_url, param),
}] }]
else: else:
......
...@@ -457,6 +457,18 @@ def synchronizeDynamicModules(context, force=False): ...@@ -457,6 +457,18 @@ def synchronizeDynamicModules(context, force=False):
except AttributeError: except AttributeError:
pass # no Activity Tool yet pass # no Activity Tool yet
from Products.CMFCore.MembershipTool import MembershipTool
tool = getattr(portal, "portal_membership", None)
if tool and tool.__class__ is not MembershipTool:
assert not tool._p_changed
tool.__class__ = MembershipTool
assert tool._p_changed
migrate = True
if portal.hasObject("portal_properties"):
portal._delObject("portal_properties", suppress_events=True)
migrate = True
if migrate: if migrate:
portal.migrateToPortalTypeClass() portal.migrateToPortalTypeClass()
portal.portal_skins.changeSkin(None) portal.portal_skins.changeSkin(None)
......
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