[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ sorry for the noise, but I changed my mind:
Yvo Schubbe
cvs-admin at zope.org
Thu Aug 1 11:43:03 CEST 2013
Log message for revision 130282:
sorry for the noise, but I changed my mind:
- renamed 'member area' to 'home folder' in recently added code
Changed:
U Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py
U Products.CMFCore/trunk/Products/CMFCore/content.zcml
U Products.CMFCore/trunk/Products/CMFCore/tests/test_MembershipTool.py
-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py 2013-07-31 08:31:08 UTC (rev 130281)
+++ Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py 2013-08-01 09:43:00 UTC (rev 130282)
@@ -74,7 +74,7 @@
id = 'portal_membership'
meta_type = 'CMF Membership Tool'
memberareaCreationFlag = 1
- _MEMBERAREA_FACTORY_NAME = 'cmf.memberarea.bbb1'
+ _HOME_FOLDER_FACTORY_NAME = 'cmf.folder.home.bbb1'
security = ClassSecurityInfo()
@@ -269,11 +269,11 @@
if hasattr(aq_base(members), member_id):
return None
- factory_name = self._MEMBERAREA_FACTORY_NAME
+ factory_name = self._HOME_FOLDER_FACTORY_NAME
portal_type_name = 'Folder'
ttool = queryUtility(ITypesTool)
if ttool is not None:
- portal_type = ttool.getTypeInfo('Member Area')
+ portal_type = ttool.getTypeInfo('Home Folder')
if portal_type is not None:
factory_name = portal_type.factory
portal_type_name = portal_type.getId()
@@ -543,12 +543,12 @@
@implementer(IFactory)
-class MemberAreaFactoryBase(object):
+class HomeFolderFactoryBase(object):
- """Creates a member area.
+ """Creates a home folder.
"""
- title = _(u'Member Area')
+ title = _(u'Home Folder')
description = _(u'A home folder for portal members.')
def __call__(self, id, title=None, *args, **kw):
@@ -562,15 +562,15 @@
return implementedBy(PortalFolder)
-class _BBBMemberAreaFactory(MemberAreaFactoryBase):
+class _BBBHomeFolderFactory(HomeFolderFactoryBase):
- """Creates a member area.
+ """Creates a home folder.
"""
description = _(u'Classic CMFCore 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)
item.manage_permission(View,
@@ -579,4 +579,4 @@
['Owner', 'Manager', 'Reviewer'], 0)
return item
-BBBMemberAreaFactory = _BBBMemberAreaFactory()
+BBBHomeFolderFactory = _BBBHomeFolderFactory()
Modified: Products.CMFCore/trunk/Products/CMFCore/content.zcml
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/content.zcml 2013-07-31 08:31:08 UTC (rev 130281)
+++ Products.CMFCore/trunk/Products/CMFCore/content.zcml 2013-08-01 09:43:00 UTC (rev 130282)
@@ -19,8 +19,8 @@
/>
<utility
- component=".MembershipTool.BBBMemberAreaFactory"
- name="cmf.memberarea.bbb1"
+ component=".MembershipTool.BBBHomeFolderFactory"
+ name="cmf.folder.home.bbb1"
/>
<five:registerClass
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_MembershipTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_MembershipTool.py 2013-07-31 08:31:08 UTC (rev 130281)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_MembershipTool.py 2013-08-01 09:43:00 UTC (rev 130282)
@@ -165,13 +165,13 @@
return site
def setUp(self):
- from Products.CMFCore.MembershipTool import BBBMemberAreaFactory
+ from Products.CMFCore.MembershipTool import BBBHomeFolderFactory
SecurityTest.setUp(self)
sm = getSiteManager()
sm.registerUtility(DummyTool(), IWorkflowTool)
- sm.registerUtility(BBBMemberAreaFactory, IFactory,
- 'cmf.memberarea.bbb1')
+ sm.registerUtility(BBBHomeFolderFactory, IFactory,
+ 'cmf.folder.home.bbb1')
def tearDown(self):
cleanUp()
More information about the checkins
mailing list