[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ sorry for the noise, but I changed my mind:
Yvo Schubbe
cvs-admin at zope.org
Thu Aug 1 11:44:12 CEST 2013
Log message for revision 130283:
sorry for the noise, but I changed my mind:
- renamed 'member area' to 'home folder' in recently added code
- renamed 'members' to 'members folder' in recently added code
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
U Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py
U Products.CMFDefault/trunk/Products/CMFDefault/content.zcml
A Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Home_Folder.xml
D Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Member_Area.xml
D Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Members.xml
A Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Members_Folder.xml
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types.xml
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/workflows.xml
U Products.CMFDefault/trunk/Products/CMFDefault/setuphandlers.py
U Products.CMFDefault/trunk/Products/CMFDefault/tests/test_MembershipTool.py
U Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Portal.py
U Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml
U Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2013-08-01 09:43:00 UTC (rev 130282)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2013-08-01 09:44:11 UTC (rev 130283)
@@ -4,14 +4,14 @@
2.3.0 (unreleased)
------------------
-- profiles and upgrade: Added new `Members` and `Member Area` portal types.
+- profiles and upgrade: Added new `Members Folder` and `Home Folder` types.
This allows to customize member area creation and behavior by modifying the
special portal types. The 'createMemberContent' hook is deprecated. An
additional upgrade step helps to convert the portal type of existing members
- folder and member areas. If you don't run the two upgrade steps and don't
- add a `Member Area` portal type, you get backwards compatible behavior.
+ and home folders. If you don't run the two upgrade steps and don't add a
+ `Home Folder` portal type, you get backwards compatible behavior.
-- content: Added `cmf.memberarea` factory for creating member areas.
+- content: Added `cmf.folder.home` factory for creating home folders.
- browser views: Synced view names with the names used in type Actions.
Modified: Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py 2013-08-01 09:43:00 UTC (rev 130282)
+++ Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py 2013-08-01 09:44:11 UTC (rev 130283)
@@ -24,7 +24,7 @@
from ZPublisher.BaseRequest import RequestContainer
from Products.CMFCore.interfaces import IMembershipTool as IBaseTool
-from Products.CMFCore.MembershipTool import MemberAreaFactoryBase
+from Products.CMFCore.MembershipTool import HomeFolderFactoryBase
from Products.CMFCore.MembershipTool import MembershipTool as BaseTool
from Products.CMFCore.utils import _checkPermission
from Products.CMFDefault.Document import Document
@@ -55,7 +55,7 @@
meta_type = 'Default Membership Tool'
membersfolder_id = 'Members'
- _MEMBERAREA_FACTORY_NAME = 'cmf.memberarea.bbb2'
+ _HOME_FOLDER_FACTORY_NAME = 'cmf.folder.home.bbb2'
security = ClassSecurityInfo()
@@ -148,13 +148,13 @@
InitializeClass(MembershipTool)
-class _MemberAreaFactory(MemberAreaFactoryBase):
+class _HomeFolderFactory(HomeFolderFactoryBase):
- """Creates a member area.
+ """Creates a home folder.
"""
def __call__(self, id, title=None, *args, **kw):
- item = super(_MemberAreaFactory,
+ item = super(_HomeFolderFactory,
self).__call__(id, title=title, *args, **kw)
# Create Member's initial content
@@ -166,18 +166,18 @@
item._setObject('index_html', subitem, suppress_events=True)
return item
-MemberAreaFactory = _MemberAreaFactory()
+HomeFolderFactory = _HomeFolderFactory()
-class _BBBMemberAreaFactory(MemberAreaFactoryBase):
+class _BBBHomeFolderFactory(HomeFolderFactoryBase):
- """Creates a member area.
+ """Creates a home folder.
"""
description = _(u'Classic CMFDefault home folder for portal members.')
def __call__(self, id, title=None, *args, **kw):
- item = super(_BBBMemberAreaFactory,
+ item = super(_BBBHomeFolderFactory,
self).__call__(id, title=title, *args, **kw)
# Create Member's initial content
@@ -195,4 +195,4 @@
item._setObject('index_html', subitem, suppress_events=True)
return item
-BBBMemberAreaFactory = _BBBMemberAreaFactory()
+BBBHomeFolderFactory = _BBBHomeFolderFactory()
Modified: Products.CMFDefault/trunk/Products/CMFDefault/content.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/content.zcml 2013-08-01 09:43:00 UTC (rev 130282)
+++ Products.CMFDefault/trunk/Products/CMFDefault/content.zcml 2013-08-01 09:44:11 UTC (rev 130283)
@@ -95,16 +95,16 @@
name="cmf.folder.skinned"
/>
- <!-- MemberArea -->
+ <!-- HomeFolder -->
<utility
- component=".MembershipTool.MemberAreaFactory"
- name="cmf.memberarea"
+ component=".MembershipTool.HomeFolderFactory"
+ name="cmf.folder.home"
/>
<utility
- component=".MembershipTool.BBBMemberAreaFactory"
- name="cmf.memberarea.bbb2"
+ component=".MembershipTool.BBBHomeFolderFactory"
+ name="cmf.folder.home.bbb2"
/>
<include package="zope.annotation" />
Copied: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Home_Folder.xml (from rev 130281, Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Member_Area.xml)
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Home_Folder.xml (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Home_Folder.xml 2013-08-01 09:44:11 UTC (rev 130283)
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<object name="Home Folder" meta_type="Factory-based Type Information"
+ i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title" i18n:translate="">Home Folder</property>
+ <property name="description"
+ i18n:translate="">A home folder for portal members.</property>
+ <property name="icon_expr">string:${portal_url}/folder_icon.gif</property>
+ <property name="content_meta_type">Portal Folder</property>
+ <property name="product"></property>
+ <property name="factory">cmf.folder.home</property>
+ <property
+ name="add_view_expr">string:${folder_url}/++add++Home%20Folder</property>
+ <property name="link_target"></property>
+ <property name="immediate_view">properties</property>
+ <property name="global_allow">False</property>
+ <property name="filter_content_types">False</property>
+ <property name="allowed_content_types"/>
+ <property name="allow_discussion">False</property>
+ <alias from="(Default)" to="index_html"/>
+ <alias from="folder_contents" to="@@edit"/>
+ <alias from="index.html" to="index_html"/>
+ <alias from="view" to="index_html"/>
+ <action title="View" action_id="view" category="object" condition_expr=""
+ icon_expr="string:${portal_url}/preview_icon.png" link_target=""
+ url_expr="string:${object_url}" visible="True">
+ <permission value="View"/>
+ </action>
+ <action title="Edit" action_id="edit" category="object" condition_expr=""
+ icon_expr="string:${portal_url}/edit_icon.png" link_target=""
+ url_expr="string:${object_url}/properties" visible="True">
+ <permission value="Manage properties"/>
+ </action>
+ <action title="Local Roles" action_id="localroles" category="object"
+ condition_expr="" icon_expr="string:${portal_url}/localroles_icon.png"
+ link_target="" url_expr="string:${object_url}/share" visible="True">
+ <permission value="Change local roles"/>
+ </action>
+ <action title="Folder contents" action_id="folderContents" category="object"
+ condition_expr="" icon_expr="string:${portal_url}/folder_icon.png"
+ link_target="" url_expr="string:${object_url}/folder_contents"
+ visible="True">
+ <permission value="List folder contents"/>
+ </action>
+</object>
Deleted: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Member_Area.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Member_Area.xml 2013-08-01 09:43:00 UTC (rev 130282)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Member_Area.xml 2013-08-01 09:44:11 UTC (rev 130283)
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<object name="Member Area" meta_type="Factory-based Type Information"
- i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">Member Area</property>
- <property name="description"
- i18n:translate="">A home folder for portal members.</property>
- <property name="icon_expr">string:${portal_url}/folder_icon.gif</property>
- <property name="content_meta_type">Portal Folder</property>
- <property name="product"></property>
- <property name="factory">cmf.memberarea</property>
- <property
- name="add_view_expr">string:${folder_url}/++add++Member%20Area</property>
- <property name="link_target"></property>
- <property name="immediate_view">properties</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <alias from="(Default)" to="index_html"/>
- <alias from="folder_contents" to="@@edit"/>
- <alias from="index.html" to="index_html"/>
- <alias from="view" to="index_html"/>
- <action title="View" action_id="view" category="object" condition_expr=""
- icon_expr="string:${portal_url}/preview_icon.png" link_target=""
- url_expr="string:${object_url}" visible="True">
- <permission value="View"/>
- </action>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
- icon_expr="string:${portal_url}/edit_icon.png" link_target=""
- url_expr="string:${object_url}/properties" visible="True">
- <permission value="Manage properties"/>
- </action>
- <action title="Local Roles" action_id="localroles" category="object"
- condition_expr="" icon_expr="string:${portal_url}/localroles_icon.png"
- link_target="" url_expr="string:${object_url}/share" visible="True">
- <permission value="Change local roles"/>
- </action>
- <action title="Folder contents" action_id="folderContents" category="object"
- condition_expr="" icon_expr="string:${portal_url}/folder_icon.png"
- link_target="" url_expr="string:${object_url}/folder_contents"
- visible="True">
- <permission value="List folder contents"/>
- </action>
-</object>
Deleted: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Members.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Members.xml 2013-08-01 09:43:00 UTC (rev 130282)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Members.xml 2013-08-01 09:44:11 UTC (rev 130283)
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<object name="Members" meta_type="Factory-based Type Information"
- i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">Members</property>
- <property name="description"
- i18n:translate="">A container for member areas.</property>
- <property name="icon_expr">string:${portal_url}/folder_icon.gif</property>
- <property name="content_meta_type">Portal Folder</property>
- <property name="product"></property>
- <property name="factory">cmf.folder</property>
- <property name="add_view_expr">string:${folder_url}/++add++Members</property>
- <property name="link_target"></property>
- <property name="immediate_view">properties</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types">
- <element value="Member Area"/>
- </property>
- <property name="allow_discussion">False</property>
- <alias from="(Default)" to="@@roster"/>
- <alias from="folder_contents" to="@@edit"/>
- <alias from="index.html" to="@@roster"/>
- <alias from="view" to="@@roster"/>
- <action title="View" action_id="view" category="object" condition_expr=""
- icon_expr="string:${portal_url}/preview_icon.png" link_target=""
- url_expr="string:${object_url}" visible="True">
- <permission value="View"/>
- </action>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
- icon_expr="string:${portal_url}/edit_icon.png" link_target=""
- url_expr="string:${object_url}/properties" visible="True">
- <permission value="Manage properties"/>
- </action>
- <action title="Local Roles" action_id="localroles" category="object"
- condition_expr="" icon_expr="string:${portal_url}/localroles_icon.png"
- link_target="" url_expr="string:${object_url}/share" visible="True">
- <permission value="Change local roles"/>
- </action>
- <action title="Folder contents" action_id="folderContents" category="object"
- condition_expr="" icon_expr="string:${portal_url}/folder_icon.png"
- link_target="" url_expr="string:${object_url}/folder_contents"
- visible="True">
- <permission value="List folder contents"/>
- </action>
-</object>
Copied: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Members_Folder.xml (from rev 130281, Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Members.xml)
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Members_Folder.xml (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Members_Folder.xml 2013-08-01 09:44:11 UTC (rev 130283)
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<object name="Members Folder" meta_type="Factory-based Type Information"
+ i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title" i18n:translate="">Members Folder</property>
+ <property name="description"
+ i18n:translate="">A container for home folders.</property>
+ <property name="icon_expr">string:${portal_url}/folder_icon.gif</property>
+ <property name="content_meta_type">Portal Folder</property>
+ <property name="product"></property>
+ <property name="factory">cmf.folder</property>
+ <property
+ name="add_view_expr">string:${folder_url}/++add++Members%20Folder</property>
+ <property name="link_target"></property>
+ <property name="immediate_view">properties</property>
+ <property name="global_allow">False</property>
+ <property name="filter_content_types">True</property>
+ <property name="allowed_content_types">
+ <element value="Home Folder"/>
+ </property>
+ <property name="allow_discussion">False</property>
+ <alias from="(Default)" to="@@roster"/>
+ <alias from="folder_contents" to="@@edit"/>
+ <alias from="index.html" to="@@roster"/>
+ <alias from="view" to="@@roster"/>
+ <action title="View" action_id="view" category="object" condition_expr=""
+ icon_expr="string:${portal_url}/preview_icon.png" link_target=""
+ url_expr="string:${object_url}" visible="True">
+ <permission value="View"/>
+ </action>
+ <action title="Edit" action_id="edit" category="object" condition_expr=""
+ icon_expr="string:${portal_url}/edit_icon.png" link_target=""
+ url_expr="string:${object_url}/properties" visible="True">
+ <permission value="Manage properties"/>
+ </action>
+ <action title="Local Roles" action_id="localroles" category="object"
+ condition_expr="" icon_expr="string:${portal_url}/localroles_icon.png"
+ link_target="" url_expr="string:${object_url}/share" visible="True">
+ <permission value="Change local roles"/>
+ </action>
+ <action title="Folder contents" action_id="folderContents" category="object"
+ condition_expr="" icon_expr="string:${portal_url}/folder_icon.png"
+ link_target="" url_expr="string:${object_url}/folder_contents"
+ visible="True">
+ <permission value="List folder contents"/>
+ </action>
+</object>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types.xml 2013-08-01 09:43:00 UTC (rev 130282)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types.xml 2013-08-01 09:44:11 UTC (rev 130283)
@@ -7,9 +7,9 @@
<object name="Favorite" meta_type="Factory-based Type Information"/>
<object name="File" meta_type="Factory-based Type Information"/>
<object name="Folder" meta_type="Factory-based Type Information"/>
+ <object name="Home Folder" meta_type="Factory-based Type Information"/>
<object name="Image" meta_type="Factory-based Type Information"/>
<object name="Link" meta_type="Factory-based Type Information"/>
- <object name="Member Area" meta_type="Factory-based Type Information"/>
- <object name="Members" meta_type="Factory-based Type Information"/>
+ <object name="Members Folder" meta_type="Factory-based Type Information"/>
<object name="News Item" meta_type="Factory-based Type Information"/>
</object>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/workflows.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/workflows.xml 2013-08-01 09:43:00 UTC (rev 130282)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/workflows.xml 2013-08-01 09:44:11 UTC (rev 130283)
@@ -12,7 +12,7 @@
<bound-workflow workflow_id="singlestate_workflow"/>
</type>
<type type_id="Folder"/>
- <type type_id="Member Area"/>
- <type type_id="Members"/>
+ <type type_id="Home Folder"/>
+ <type type_id="Members Folder"/>
</bindings>
</object>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/setuphandlers.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/setuphandlers.py 2013-08-01 09:43:00 UTC (rev 130282)
+++ Products.CMFDefault/trunk/Products/CMFDefault/setuphandlers.py 2013-08-01 09:44:11 UTC (rev 130283)
@@ -35,10 +35,10 @@
site = context.getSite()
ttool = getUtility(ITypesTool)
- portal_type = ttool.getTypeInfo('Members')
+ portal_type = ttool.getTypeInfo('Members Folder')
factory = getUtility(IFactory, portal_type.factory)
obj = factory(id='Members')
- obj._setPortalTypeName('Members')
+ obj._setPortalTypeName('Members Folder')
site._setObject('Members', obj)
logger.info('Members folder imported.')
Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_MembershipTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_MembershipTool.py 2013-08-01 09:43:00 UTC (rev 130282)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_MembershipTool.py 2013-08-01 09:44:11 UTC (rev 130283)
@@ -43,8 +43,8 @@
class DummyTool(DummyTool):
def getTypeInfo(self, contentType):
- ti = DummyType('Member Area')
- ti.factory = 'cmf.memberarea'
+ ti = DummyType('Home Folder')
+ ti.factory = 'cmf.folder.home'
return ti
@@ -130,7 +130,7 @@
def test_createMemberArea(self):
from Products.CMFDefault.interfaces import IMembershipTool
- from Products.CMFDefault.MembershipTool import MemberAreaFactory
+ from Products.CMFDefault.MembershipTool import HomeFolderFactory
mtool = self.site.portal_membership
members = self.site._setObject('Members', PortalFolder('Members'))
@@ -141,7 +141,7 @@
sm.registerUtility(mtool, IMembershipTool)
sm.registerUtility(ttool, ITypesTool)
sm.registerUtility(wtool, IWorkflowTool)
- sm.registerUtility(MemberAreaFactory, IFactory, 'cmf.memberarea')
+ sm.registerUtility(HomeFolderFactory, IFactory, 'cmf.folder.home')
# permission
mtool.createMemberArea('user_foo')
@@ -163,7 +163,7 @@
ownership = acl_users.user_foo
localroles = (('user_foo', ('Owner',)),)
self.assertEqual(f.Title(), "user_foo's Home")
- self.assertEqual(f.getPortalTypeName(), 'Member Area')
+ self.assertEqual(f.getPortalTypeName(), 'Home Folder')
self.assertEqual(f.getOwner(), ownership)
self.assertEqual(f.get_local_roles(), localroles,
'CMF Collector issue #162 (LocalRoles broken): %s'
@@ -186,7 +186,7 @@
def test_createMemberArea_BBB(self):
from Products.CMFDefault.interfaces import IMembershipTool
- from Products.CMFDefault.MembershipTool import BBBMemberAreaFactory
+ from Products.CMFDefault.MembershipTool import BBBHomeFolderFactory
mtool = self.site.portal_membership
members = self.site._setObject('Members', PortalFolder('Members'))
@@ -195,8 +195,8 @@
sm = getSiteManager()
sm.registerUtility(mtool, IMembershipTool)
sm.registerUtility(wtool, IWorkflowTool)
- sm.registerUtility(BBBMemberAreaFactory, IFactory,
- 'cmf.memberarea.bbb2')
+ sm.registerUtility(BBBHomeFolderFactory, IFactory,
+ 'cmf.folder.home.bbb2')
# permission
mtool.createMemberArea('user_foo')
Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Portal.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Portal.py 2013-08-01 09:43:00 UTC (rev 130282)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Portal.py 2013-08-01 09:44:11 UTC (rev 130283)
@@ -65,8 +65,8 @@
if x not in ('Discussion Item',
'CMF BTree Folder',
'Folder',
- 'Member Area',
- 'Members',
+ 'Home Folder',
+ 'Members Folder',
'Topic') ]
self.assertEqual( len( catalog ), 0 )
Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml 2013-08-01 09:43:00 UTC (rev 130282)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml 2013-08-01 09:44:11 UTC (rev 130283)
@@ -255,14 +255,14 @@
<genericsetup:upgradeStep
title="Add new portal types"
- description="Add 'Members' and 'Member Area' portal types."
+ description="Add 'Members Folder' and 'Home Folder' portal types."
handler=".to23.upgrade_portal_types"
checker=".to23.check_portal_types"
/>
<genericsetup:upgradeStep
title="Upgrade member areas"
- description="Convert portal type of members folder and member areas."
+ description="Convert portal type of members and home folders."
handler=".to23.upgrade_member_areas"
checker=".to23.check_member_areas"
/>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py 2013-08-01 09:43:00 UTC (rev 130282)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py 2013-08-01 09:44:11 UTC (rev 130283)
@@ -559,11 +559,11 @@
"""
ttool = getToolByName(tool, 'portal_types')
try:
- ttool['Member Area']
+ ttool['Home Folder']
except KeyError:
return True
try:
- ttool['Members']
+ ttool['Members Folder']
except KeyError:
return True
return False
@@ -577,43 +577,43 @@
environ = SetupEnviron()
environ._should_purge = False
try:
- ttool['Member Area']
+ ttool['Home Folder']
except KeyError:
- getMultiAdapter((ttool, environ), IBody).body = _TTOOL_MEMBER_AREA_XML
- obj = ttool['Member Area']
- getMultiAdapter((obj, environ), IBody).body = _MEMBER_AREA_XML
- getMultiAdapter((wtool, environ), IBody).body = _WTOOL_MEMBER_AREA_XML
- logger.info("'Member Area' type added.")
+ getMultiAdapter((ttool, environ), IBody).body = _TTOOL_HOME_XML
+ obj = ttool['Home Folder']
+ getMultiAdapter((obj, environ), IBody).body = _HOME_FOLDER_XML
+ getMultiAdapter((wtool, environ), IBody).body = _WTOOL_HOME_XML
+ logger.info("'Home Folder' type added.")
try:
- ttool['Members']
+ ttool['Members Folder']
except KeyError:
getMultiAdapter((ttool, environ), IBody).body = _TTOOL_MEMBERS_XML
- obj = ttool['Members']
- getMultiAdapter((obj, environ), IBody).body = _MEMBERS_XML
+ obj = ttool['Members Folder']
+ getMultiAdapter((obj, environ), IBody).body = _MEMBERS_FOLDER_XML
getMultiAdapter((wtool, environ), IBody).body = _WTOOL_MEMBERS_XML
- logger.info("'Members' type added.")
+ logger.info("'Members Folder' type added.")
-_TTOOL_MEMBER_AREA_XML = """\
+_TTOOL_HOME_XML = """\
<?xml version="1.0"?>
<object name="portal_types">
- <object insert-after="Link" name="Member Area"
+ <object insert-after="Folder" name="Home Folder"
meta_type="Factory-based Type Information"/>
</object>
"""
-_MEMBER_AREA_XML = """\
+_HOME_FOLDER_XML = """\
<?xml version="1.0"?>
-<object name="Member Area" meta_type="Factory-based Type Information"
+<object name="Home Folder" meta_type="Factory-based Type Information"
i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">Member Area</property>
+ <property name="title" i18n:translate="">Home Folder</property>
<property name="description"
i18n:translate="">A home folder for portal members.</property>
<property name="icon_expr">string:${portal_url}/folder_icon.gif</property>
<property name="content_meta_type">Portal Folder</property>
<property name="product"></property>
- <property name="factory">cmf.memberarea</property>
+ <property name="factory">cmf.folder.home</property>
<property
- name="add_view_expr">string:${folder_url}/++add++Member%20Area</property>
+ name="add_view_expr">string:${folder_url}/++add++Home%20Folder</property>
<property name="link_target"></property>
<property name="immediate_view">properties</property>
<property name="global_allow">False</property>
@@ -651,29 +651,30 @@
_TTOOL_MEMBERS_XML = """\
<?xml version="1.0"?>
<object name="portal_types">
- <object insert-after="Member Area" name="Members"
+ <object insert-after="Link" name="Members Folder"
meta_type="Factory-based Type Information"/>
</object>
"""
-_MEMBERS_XML = """\
+_MEMBERS_FOLDER_XML = """\
<?xml version="1.0"?>
-<object name="Members" meta_type="Factory-based Type Information"
+<object name="Members Folder" meta_type="Factory-based Type Information"
i18n:domain="cmf_default" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title" i18n:translate="">Members</property>
+ <property name="title" i18n:translate="">Members Folder</property>
<property name="description"
- i18n:translate="">A container for member areas.</property>
+ i18n:translate="">A container for home folders.</property>
<property name="icon_expr">string:${portal_url}/folder_icon.gif</property>
<property name="content_meta_type">Portal Folder</property>
<property name="product"></property>
<property name="factory">cmf.folder</property>
- <property name="add_view_expr">string:${folder_url}/++add++Members</property>
+ <property
+ name="add_view_expr">string:${folder_url}/++add++Members%20Folder</property>
<property name="link_target"></property>
<property name="immediate_view">properties</property>
<property name="global_allow">False</property>
<property name="filter_content_types">True</property>
<property name="allowed_content_types">
- <element value="Member Area"/>
+ <element value="Home Folder"/>
</property>
<property name="allow_discussion">False</property>
<alias from="(Default)" to="@@roster"/>
@@ -704,11 +705,11 @@
</object>
"""
-_WTOOL_MEMBER_AREA_XML = """\
+_WTOOL_HOME_XML = """\
<?xml version="1.0"?>
<object name="portal_workflow">
<bindings>
- <type type_id="Member Area"/>
+ <type type_id="Home Folder"/>
</bindings>
</object>
"""
@@ -717,7 +718,7 @@
<?xml version="1.0"?>
<object name="portal_workflow">
<bindings>
- <type type_id="Members"/>
+ <type type_id="Members Folder"/>
</bindings>
</object>
"""
@@ -732,10 +733,10 @@
if 'index_html' in members:
if members['index_html'].meta_type == 'DTML Method':
return True
- if members.getPortalTypeName() != 'Members':
+ if members.getPortalTypeName() != 'Members Folder':
return True
for f in members.objectValues('Portal Folder'):
- if f.getPortalTypeName() != 'Member Area':
+ if f.getPortalTypeName() != 'Home Folder':
return True
return False
@@ -751,10 +752,10 @@
if members['index_html'].meta_type == 'DTML Method':
members._delObject('index_html')
logger.info("'index_html' method removed from members.")
- if members.getPortalTypeName() != 'Members':
- members._setPortalTypeName('Members')
+ if members.getPortalTypeName() != 'Members Folder':
+ members._setPortalTypeName('Members Folder')
logger.info("Portal type of '{0}' fixed.".format(members.getId()))
for f in members.objectValues('Portal Folder'):
- if f.getPortalTypeName() != 'Member Area':
- f._setPortalTypeName('Member Area')
+ if f.getPortalTypeName() != 'Home Folder':
+ f._setPortalTypeName('Home Folder')
logger.info("Portal type of '{0}' fixed.".format(f.getId()))
More information about the checkins
mailing list