[CMF-checkins] CVS: CMF/CMFDefault - DiscussionTool.py:1.14 MembershipTool.py:1.30 MetadataTool.py:1.20 PropertiesTool.py:1.11
Yvo Schubbe
schubbe@web.de
Thu, 13 Feb 2003 02:46:21 -0500
Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv12702/CMFDefault
Modified Files:
DiscussionTool.py MembershipTool.py MetadataTool.py
PropertiesTool.py
Log Message:
Merged yuppie-collector123-branch:
- Changed _actions' making them tuples. (Collector #123)
=== CMF/CMFDefault/DiscussionTool.py 1.13 => 1.14 ===
--- CMF/CMFDefault/DiscussionTool.py:1.13 Tue Feb 4 17:31:59 2003
+++ CMF/CMFDefault/DiscussionTool.py Thu Feb 13 02:46:21 2003
@@ -1,7 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001-2003 Zope Corporation and Contributors.
-# All Rights Reserved.
+# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
@@ -43,7 +42,7 @@
id = 'portal_discussion'
meta_type = 'Default Discussion Tool'
- _actions = [ActionInformation(id='reply'
+ _actions = (ActionInformation(id='reply'
, title='Reply'
, action=Expression(
text='string: ${object_url}/discussion_reply_form')
@@ -53,7 +52,9 @@
, permissions=('Reply to item',)
, category='object'
, visible=1
- )]
+ )
+ ,
+ )
security = ClassSecurityInfo()
=== CMF/CMFDefault/MembershipTool.py 1.29 => 1.30 ===
--- CMF/CMFDefault/MembershipTool.py:1.29 Tue Feb 4 17:32:51 2003
+++ CMF/CMFDefault/MembershipTool.py Thu Feb 13 02:46:21 2003
@@ -1,7 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001-2003 Zope Corporation and Contributors.
-# All Rights Reserved.
+# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
@@ -51,7 +50,8 @@
__implements__ = BaseTool.__implements__
- _actions =[
+ meta_type = 'Default Membership Tool'
+ _actions = (
AI( id='login'
, title='Login'
, description='Click here to Login'
@@ -112,10 +112,7 @@
+ 'getHomeFolder(), "Favorites")')
, visible=1
)
- ]
-
- meta_type = 'Default Membership Tool'
-
+ )
security = ClassSecurityInfo()
=== CMF/CMFDefault/MetadataTool.py 1.19 => 1.20 ===
--- CMF/CMFDefault/MetadataTool.py:1.19 Tue Feb 4 17:32:51 2003
+++ CMF/CMFDefault/MetadataTool.py Thu Feb 13 02:46:21 2003
@@ -1,7 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001-2003 Zope Corporation and Contributors.
-# All Rights Reserved.
+# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
@@ -203,12 +202,9 @@
__implements__ = (IMetadataTool, ActionProviderBase.__implements__)
- id = 'portal_metadata'
- meta_type = 'Default Metadata Tool'
-
- _actions = []
-
- security = ClassSecurityInfo()
+ id = 'portal_metadata'
+ meta_type = 'Default Metadata Tool'
+ _actions = ()
#
# Default values.
@@ -217,6 +213,8 @@
element_specs = None
#initial_values_hook = None
#validation_hook = None
+
+ security = ClassSecurityInfo()
def __init__( self
, publisher=None
=== CMF/CMFDefault/PropertiesTool.py 1.10 => 1.11 ===
--- CMF/CMFDefault/PropertiesTool.py:1.10 Tue Feb 4 17:38:01 2003
+++ CMF/CMFDefault/PropertiesTool.py Thu Feb 13 02:46:21 2003
@@ -1,7 +1,6 @@
##############################################################################
#
-# Copyright (c) 2001-2003 Zope Corporation and Contributors.
-# All Rights Reserved.
+# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
@@ -38,7 +37,7 @@
id = 'portal_properties'
meta_type = 'Default Properties Tool'
- _actions = [ActionInformation(id='configPortal'
+ _actions = (ActionInformation(id='configPortal'
, title='Reconfigure Portal'
, description='Reconfigure the portal'
, action=Expression(
@@ -47,7 +46,9 @@
, category='global'
, condition=None
, visible=1
- )]
+ )
+ ,
+ )
security = ClassSecurityInfo()