[CMF-checkins] SVN: CMF/trunk/C - Remove all "old-style" actions
from tools that still carried them
Jens Vagelpohl
jens at dataflake.org
Sun Sep 11 14:41:24 EDT 2005
Log message for revision 38442:
- Remove all "old-style" actions from tools that still carried them
(CMFDefault.MembershipTool, CMFDefault.PropertiesTool,
CMFDefault.RegistrationTool, CMFDefault.SyndicationTool,
CMFDefault.DiscussionTool, CMFCore.UndoTool). These have been
superceded by "new-style" action information objects stored inside
the Actions Tool.
Changed:
U CMF/trunk/CHANGES.txt
U CMF/trunk/CMFCore/UndoTool.py
U CMF/trunk/CMFDefault/DiscussionTool.py
U CMF/trunk/CMFDefault/MembershipTool.py
U CMF/trunk/CMFDefault/PropertiesTool.py
U CMF/trunk/CMFDefault/RegistrationTool.py
U CMF/trunk/CMFDefault/SyndicationTool.py
-=-
Modified: CMF/trunk/CHANGES.txt
===================================================================
--- CMF/trunk/CHANGES.txt 2005-09-11 18:34:58 UTC (rev 38441)
+++ CMF/trunk/CHANGES.txt 2005-09-11 18:41:23 UTC (rev 38442)
@@ -76,6 +76,15 @@
Others
+ - Remove all "old-style" actions from tools that still carried them
+ (CMFDefault.MembershipTool, CMFDefault.PropertiesTool,
+ CMFDefault.RegistrationTool, CMFDefault.SyndicationTool,
+ CMFDefault.DiscussionTool, CMFCore.UndoTool). These have been
+ superceded by "new-style" action information objects stored inside
+ the Actions Tool.
+
+ - TypesTool: Removed deprecated by_metatype argument of listContentTypes.
+
- Some simplifications to the slurp_release release helper script and
updates to the RELEASE.txt release instructions.
Modified: CMF/trunk/CMFCore/UndoTool.py
===================================================================
--- CMF/trunk/CMFCore/UndoTool.py 2005-09-11 18:34:58 UTC (rev 38441)
+++ CMF/trunk/CMFCore/UndoTool.py 2005-09-11 18:41:23 UTC (rev 38442)
@@ -41,18 +41,7 @@
id = 'portal_undo'
meta_type = 'CMF Undo Tool'
- _actions = (ActionInformation(id='undo'
- , title='Undo'
- , action=Expression(
- text='string:${portal_url}/undo_form')
- , condition=Expression(
- text='member')
- , permissions=(ListUndoableChanges,)
- , category='global'
- , visible=1
- )
- ,
- )
+ _actions = ()
security = ClassSecurityInfo()
Modified: CMF/trunk/CMFDefault/DiscussionTool.py
===================================================================
--- CMF/trunk/CMFDefault/DiscussionTool.py 2005-09-11 18:34:58 UTC (rev 38441)
+++ CMF/trunk/CMFDefault/DiscussionTool.py 2005-09-11 18:41:23 UTC (rev 38442)
@@ -48,19 +48,7 @@
id = 'portal_discussion'
meta_type = 'Default Discussion Tool'
- _actions = (ActionInformation(id='reply'
- , title='Reply'
- , action=Expression(
- text='string:${object_url}/discussion_reply_form')
- , condition=Expression(
- text='python: object is not None and ' +
- 'portal.portal_discussion.isDiscussionAllowedFor(object)')
- , permissions=(ReplyToItem,)
- , category='object'
- , visible=1
- )
- ,
- )
+ _actions = ()
security = ClassSecurityInfo()
Modified: CMF/trunk/CMFDefault/MembershipTool.py
===================================================================
--- CMF/trunk/CMFDefault/MembershipTool.py 2005-09-11 18:34:58 UTC (rev 38441)
+++ CMF/trunk/CMFDefault/MembershipTool.py 2005-09-11 18:41:23 UTC (rev 38442)
@@ -58,89 +58,8 @@
__implements__ = (IMembershipTool, ActionProviderBase.__implements__)
meta_type = 'Default Membership Tool'
- _actions = (
- AI( id='login'
- , title='Login'
- , description='Click here to Login'
- , action=Expression(text='string:${portal_url}/login_form')
- , permissions=(View,)
- , category='user'
- , condition=Expression(text='not: member')
- , visible=1
- )
- , AI( id='preferences'
- , title='Preferences'
- , description='Change your user preferences'
- , action=Expression(text='string:${portal_url}/personalize_form')
- , permissions=(View,)
- , category='user'
- , condition=Expression(text='member')
- , visible=1
- )
- , AI( id='logout'
- , title='Log out'
- , description='Click here to logout'
- , action=Expression(text='string:${portal_url}/logout')
- , permissions=(View,)
- , category='user'
- , condition=Expression(text='member')
- , visible=1
- )
- , AI( id='addFavorite'
- , title='Add to favorites'
- , description='Add this item to your favorites'
- , action=Expression(text='string:${object_url}/addtoFavorites')
- , permissions=(View,)
- , category='user'
- , condition=Expression(text= 'portal/portal_membership'
- + '/getHomeFolder')
- , visible=1
- )
- , AI( id='mystuff'
- , title='My stuff'
- , description='Goto your home folder'
- , action=Expression(text='string:${portal/portal_membership'
- + '/getHomeUrl}/folder_contents')
- , permissions=(View,)
- , category='user'
- , condition=Expression( text='python: member and '
- + 'portal.portal_membership.getHomeFolder()')
- , visible=1
- )
- , AI( id='favorites'
- , title='My favorites'
- , description='Browse your favorites'
- , action=Expression(text='string:${portal/portal_membership'
- + '/getHomeUrl}/Favorites/folder_contents')
- , permissions=(View,)
- , category='user'
- , condition=Expression( text='python: member and '
- + 'hasattr(portal.portal_membership.'
- + 'getHomeFolder(), "Favorites")')
- , visible=1
- )
- , AI( id='manage_members'
- , title='Manage members'
- , description='Manage portal members'
- , action=Expression(text='string:${portal_url}/members_manage_form')
- , permissions=(ManageUsers,)
- , category='global'
- , condition=None
- , visible=1
- )
- , AI( id='logged_in'
- , title='Logged in'
- , description='Used by scripts'
- , action=Expression(text='string:${portal_url}/logged_in')
- , permissions=(View,)
- , category='user'
- , condition=None
- , visible=0
- )
- )
-
+ _actions = ()
membersfolder_id = 'Members'
-
security = ClassSecurityInfo()
#
Modified: CMF/trunk/CMFDefault/PropertiesTool.py
===================================================================
--- CMF/trunk/CMFDefault/PropertiesTool.py 2005-09-11 18:34:58 UTC (rev 38441)
+++ CMF/trunk/CMFDefault/PropertiesTool.py 2005-09-11 18:41:23 UTC (rev 38442)
@@ -36,19 +36,7 @@
id = 'portal_properties'
meta_type = 'Default Properties Tool'
- _actions = (ActionInformation(id='configPortal'
- , title='Reconfigure Portal'
- , description='Reconfigure the portal'
- , action=Expression(
- text='string:${portal_url}/reconfig_form')
- , permissions=(ManagePortal,)
- , category='global'
- , condition=None
- , visible=1
- )
- ,
- )
-
+ _actions = ()
security = ClassSecurityInfo()
manage_options = ( ActionProviderBase.manage_options +
Modified: CMF/trunk/CMFDefault/RegistrationTool.py
===================================================================
--- CMF/trunk/CMFDefault/RegistrationTool.py 2005-09-11 18:34:58 UTC (rev 38441)
+++ CMF/trunk/CMFDefault/RegistrationTool.py 2005-09-11 18:41:23 UTC (rev 38442)
@@ -39,19 +39,7 @@
__implements__ = BaseTool.__implements__
meta_type = 'Default Registration Tool'
- _actions = ( ActionInformation( id='join'
- , title='Join'
- , description='Click here to Join'
- , action=Expression(
- text='string:${portal_url}/join_form')
- , permissions=(AddPortalMember,)
- , category='user'
- , condition=Expression(text='not: member')
- , visible=1
- )
- ,
- )
-
+ _actions = ()
security = ClassSecurityInfo()
#
Modified: CMF/trunk/CMFDefault/SyndicationTool.py
===================================================================
--- CMF/trunk/CMFDefault/SyndicationTool.py 2005-09-11 18:34:58 UTC (rev 38441)
+++ CMF/trunk/CMFDefault/SyndicationTool.py 2005-09-11 18:41:23 UTC (rev 38442)
@@ -48,19 +48,8 @@
id = 'portal_syndication'
meta_type = 'Default Syndication Tool'
- _actions = ( ActionInformation(
- id='syndication'
- , title='Syndication'
- , action=Expression(
- text='string:${folder_url}/synPropertiesForm')
- , condition=Expression(
- text='python: folder is object')
- , permissions=(ManageProperties,)
- , category='object'
- , visible=1
- )
- ,
- )
+ _actions = ()
+ security = ClassSecurityInfo()
#Default Sitewide Values
isAllowed = 0
@@ -69,8 +58,6 @@
syUpdateBase = DateTime()
max_items = 15
- security = ClassSecurityInfo()
-
#ZMI Methods
manage_options = ( ActionProviderBase.manage_options
+ ( { 'label' : 'Overview'
More information about the CMF-checkins
mailing list