[Zope-Checkins] CVS: Zope/lib/python/Products/OFSP - __init__.py:1.38

[Yvo Schubbe]

Update of /cvs-repository/Zope/lib/python/Products/OFSP
In directory cvs.zope.org:/tmp/cvs-serv760/lib/python/Products/OFSP

Modified Files:
	__init__.py 
Log Message:
Merged yuppie-ordersupport-branch:
- Added OrderSupport and OrderedFolder.
- Added optional 'id' argument to Folder constructor.
- Modified main.dtml to play well with Folder and OrderedFolder.


=== Zope/lib/python/Products/OFSP/__init__.py 1.37 => 1.38 ===
--- Zope/lib/python/Products/OFSP/__init__.py:1.37	Wed Aug 14 18:16:04 2002
+++ Zope/lib/python/Products/OFSP/__init__.py	Thu Jun 12 06:21:01 2003
@@ -16,8 +16,11 @@
 
 import Version, OFS.Image, OFS.Folder, AccessControl.User
 import OFS.DTMLMethod, OFS.DTMLDocument, OFS.PropertySheets
+import OFS.OrderedFolder
 import ZClasses.ObjectManager
 
+from AccessControl.Permissions import add_documents_images_and_files
+from AccessControl.Permissions import add_folders
 from ZClasses import createZClassForBase
 
 createZClassForBase( OFS.DTMLMethod.DTMLMethod, globals()
@@ -30,6 +33,7 @@
                    , 'ZFile', 'File' )
 createZClassForBase( OFS.Folder.Folder, globals()
                    , 'ZFolder', 'Folder' )
+createZClassForBase( OFS.OrderedFolder.OrderedFolder, globals() )
 createZClassForBase( AccessControl.User.UserFolder, globals()
                    , 'ZUserFolder', 'User Folder' )
 createZClassForBase( AccessControl.User.User, globals()
@@ -39,11 +43,9 @@
 # that this more direct mechanism will be more understandable.
 def initialize(context):
 
-    perm='Add Documents, Images, and Files'
-
     context.registerClass(
         OFS.DTMLMethod.DTMLMethod,
-        permission=perm,
+        permission=add_documents_images_and_files,
         constructors=(OFS.DTMLMethod.addForm, OFS.DTMLMethod.addDTMLMethod,),
         icon='images/dtmlmethod.gif',
         legacy=(
@@ -54,27 +56,25 @@
 
     context.registerClass(
         OFS.DTMLDocument.DTMLDocument,
-        permission=perm,
+        permission=add_documents_images_and_files,
         constructors=(OFS.DTMLDocument.addForm,
                       OFS.DTMLDocument.addDTMLDocument),
         icon='images/dtmldoc.gif',
         legacy=(('manage_addDTMLDocument', OFS.DTMLDocument.addDTMLDocument),),
         )
 
-
     context.registerClass(
         OFS.Image.Image,
-        permission=perm,
+        permission=add_documents_images_and_files,
         constructors=(('imageAdd',OFS.Image.manage_addImageForm),
                       OFS.Image.manage_addImage),
         icon='images/Image_icon.gif',
         legacy=(OFS.Image.manage_addImage,),
         )
 
-
     context.registerClass(
         OFS.Image.File,
-        permission=perm,
+        permission=add_documents_images_and_files,
         constructors=(('fileAdd',OFS.Image.manage_addFileForm),
                       OFS.Image.manage_addFile),
         icon='images/File_icon.gif',
@@ -89,6 +89,14 @@
         legacy=(OFS.Folder.manage_addFolder,),
         )
 
+    context.registerClass(
+        OFS.OrderedFolder.OrderedFolder,
+        permission=add_folders,
+        constructors=(OFS.OrderedFolder.manage_addOrderedFolderForm,
+                      OFS.OrderedFolder.manage_addOrderedFolder),
+        icon='images/Folder_icon.gif',
+        legacy=(OFS.OrderedFolder.manage_addOrderedFolder,),
+        )
 
     context.registerClass(
         AccessControl.User.UserFolder,