[CMF-checkins] CVS: CMF/CMFCore - ActionsTool.py:1.47 PortalFolder.py:1.57

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv9061/CMFCore

Modified Files:
	ActionsTool.py PortalFolder.py 
Log Message:
- fixed some action inconsistencies (see CHANGES.txt for details)


=== CMF/CMFCore/ActionsTool.py 1.46 => 1.47 ===
--- CMF/CMFCore/ActionsTool.py:1.46	Fri Feb  6 05:12:17 2004
+++ CMF/CMFCore/ActionsTool.py	Mon Feb 23 07:55:02 2004
@@ -57,19 +57,10 @@
                                 , condition=Expression(
                text='python: folder is not object')
                                 , permissions=(ListFolderContents,)
-                                , category='object'
-                                , visible=1
-                                 )
-              , ActionInformation(id='folderContents'
-                                , title='Folder contents'
-                                , action=Expression(
-               text='string:${folder_url}/folder_contents')
-                                , condition=Expression(
-               text='python: folder is object')
-                                , permissions=(ListFolderContents,)
                                 , category='folder'
                                 , visible=1
                                  )
+               ,
                )
 
     action_providers = ( 'portal_membership'


=== CMF/CMFCore/PortalFolder.py 1.56 => 1.57 ===
--- CMF/CMFCore/PortalFolder.py:1.56	Sat Jan 31 15:34:03 2004
+++ CMF/CMFCore/PortalFolder.py	Mon Feb 23 07:55:02 2004
@@ -49,40 +49,40 @@
   , 'factory'        : 'manage_addPortalFolder'
   , 'filter_content_types' : 0
   , 'immediate_view' : 'folder_edit_form'
-  , 'aliases'        : {'(Default)':'index_html',
-                        'view':'index_html',
+  , 'aliases'        : {'(Default)': 'index_html',
+                        'view': 'index_html',
                         'index.html':'index_html'}
   , 'actions'        : ( { 'id'            : 'view'
                          , 'name'          : 'View'
                          , 'action': 'string:${object_url}'
                          , 'permissions'   : (View,)
-                         , 'category'      : 'folder'
                          }
                        , { 'id'            : 'edit'
                          , 'name'          : 'Edit'
                          , 'action': 'string:${object_url}/folder_edit_form'
                          , 'permissions'   : (ManageProperties,)
-                         , 'category'      : 'folder'
                          }
                        , { 'id'            : 'localroles'
                          , 'name'          : 'Local Roles'
                          , 'action':
                                   'string:${object_url}/folder_localrole_form'
                          , 'permissions'   : (ChangeLocalRoles,)
-                         , 'category'      : 'folder'
+                         }
+                       , { 'id'            : 'folderContents'
+                         , 'name'          : 'Folder contents'
+                         , 'action': 'string:${object_url}/folder_contents'
+                         , 'permissions'   : (ListFolderContents,)
                          }
                        , { 'id'            : 'new'
                          , 'name'          : 'New...'
                          , 'action': 'string:${object_url}/folder_factories'
                          , 'permissions'   : (AddPortalContent,)
-                         , 'category'      : 'folder'
                          , 'visible'       : 0
                          }
                        , { 'id'            : 'rename_items'
                          , 'name'          : 'Rename items'
                          , 'action': 'string:${object_url}/folder_rename_form'
                          , 'permissions'   : (AddPortalContent,)
-                         , 'category'      : 'folder'
                          , 'visible'       : 0
                          }
                        )