[CMF-checkins] CVS: CMF - CMFCorePermissions.py:1.6 PortalFolder.py:1.13

[tseaver@digicool.com]

Update of /cvs-repository/CMF/CMFCore
In directory korak.digicool.com:/tmp/cvs-serv18029/CMFCore

Modified Files:
	CMFCorePermissions.py PortalFolder.py 
Log Message:


 - Use named permissions instead of strings in all
   'factory_type_information' records.



--- Updated File CMFCorePermissions.py in package CMF --
--- CMFCorePermissions.py	2001/05/11 03:38:28	1.5
+++ CMFCorePermissions.py	2001/05/24 20:39:39	1.6
@@ -47,6 +47,9 @@
 ModifyPortalContent = 'Modify portal content'
 setDefaultRoles(ModifyPortalContent, ('Manager',))
 
+ManageProperties = 'Manage properties'
+setDefaultRoles(ModifyPortalContent, ('Owner','Manager',))
+
 ListPortalMembers = 'List portal members'
 setDefaultRoles(ListPortalMembers, ('Manager', 'Member'))
 

--- Updated File PortalFolder.py in package CMF --
--- PortalFolder.py	2001/05/24 20:18:59	1.12
+++ PortalFolder.py	2001/05/24 20:39:39	1.13
@@ -91,7 +91,8 @@
 import Globals, re, base64, marshal, string
 import CMFCorePermissions
 
-from CMFCorePermissions import AddPortalFolders, AddPortalContent, View
+from CMFCorePermissions import View, ManageProperties
+from CMFCorePermissions import AddPortalFolders, AddPortalContent
 from OFS.Folder import Folder
 from OFS.ObjectManager import REPLACEABLE
 from Globals import HTMLFile
@@ -112,17 +113,17 @@
                              , 'actions'        :
                                 ( { 'name'          : 'View'
                                   , 'action'        : ''
-                                  , 'permissions'   : ('View',)
+                                  , 'permissions'   : (View,)
                                   , 'category'      : 'folder'
                                   }
                                 , { 'name'          : 'Edit'
                                   , 'action'        : 'folder_edit_form'
-                                  , 'permissions'   : ('Manage properties',)
+                                  , 'permissions'   : (ManageProperties,)
                                   , 'category'      : 'folder'
                                   }
                                 , { 'name'          : 'Syndication'
                                   , 'action'        : 'synPropertiesForm'
-                                  , 'permissions'   : ('Modify properties',)
+                                  , 'permissions'   : (ManageProperties,)
                                   , 'category'      : 'folder'
                                   }
                                 )