Added a DefaultPropertySheets class for use by objects that are currently

PropertyManagers. Also added automagic assignment of the 'Owner' role as
a local role to a user upon creating an object.

lib/python/OFS/ObjectManager.py

@@ -84,15 +84,16 @@
 ##############################################################################
 __doc__="""Object Manager
 
-$Id: ObjectManager.py,v 1.67 1999/04/19 22:30:29 jim Exp $"""
+$Id: ObjectManager.py,v 1.68 1999/04/22 15:55:39 brian Exp $"""
 
-__version__='$Revision: 1.67 $'[11:-2]
+__version__='$Revision: 1.68 $'[11:-2]
 
 import App.Management, Acquisition, App.Undo, Globals, CopySupport
 import os, App.FactoryDispatcher, ts_regex, Products
 from Globals import HTMLFile, HTMLFile, Persistent
 from Globals import MessageDialog, default__class_init__
 from webdav.NullResource import NullResource
+from webdav.Collection import Collection
 from urllib import quote
 from cStringIO import StringIO
 import marshal
@@ -107,6 +108,7 @@ class ObjectManager(
     Acquisition.Implicit,
     Persistent,
     App.Undo.UndoSupport,
+    Collection,
     ):
     """Generic object manager
 
@@ -199,11 +201,16 @@ class ObjectManager(
     def _setObject(self,id,object,roles=None,user=None):
         v=self._checkId(id)
         if v is not None: id=v
-        
         try:    t=object.meta_type
         except: t=None
         self._objects=self._objects+({'id':id,'meta_type':t},)
         self._setOb(id,object)
+        # Try to give user the local role "Owner".
+        if hasattr(self, 'REQUEST') and hasattr(object, '__ac_local_roles__'):
+            user=self.REQUEST['AUTHENTICATED_USER']
+            name=user.getUserName()
+            if name != 'Anonymous':
+                object.manage_setLocalRoles(name, ['Owner'])
         return id
 
     def _delObject(self,id):

lib/python/OFS/PropertyManager.py

@@ -84,9 +84,10 @@
 ##############################################################################
 
 """Property management"""
-__version__='$Revision: 1.13 $'[11:-2]
+__version__='$Revision: 1.14 $'[11:-2]
 
 import ExtensionClass
+from PropertySheets import DefaultPropertySheets, vps
 from ZPublisher.Converters import type_converters
 from Globals import HTMLFile, MessageDialog
 from string import find,join,lower,split
@@ -95,7 +96,7 @@ from Acquisition import Implicit
 from Globals import Persistent
 from DateTime import DateTime
 
-from PropertySheets import vps
+
 
 class PropertyManager(ExtensionClass.Base):
     """
@@ -173,7 +174,7 @@ class PropertyManager(ExtensionClass.Base):
         )
 
     __propsets__=()
-    propertysheets=vps()
+    propertysheets=vps(DefaultPropertySheets)
 
     def valid_property_id(self, id):
         if not id or id[:1]=='_' or (' ' in id) \

lib/python/OFS/PropertySheets.py

@@ -84,7 +84,7 @@
 ##############################################################################
 
 """Property sheets"""
-__version__='$Revision: 1.38 $'[11:-2]
+__version__='$Revision: 1.39 $'[11:-2]
 
 import time, string, App.Management, Globals
 from ZPublisher.Converters import type_converters
@@ -276,10 +276,13 @@ class PropertySheet(Persistent, Implicit):
 
     def propertyMap(self):
         # Return a tuple of mappings, giving meta-data for properties.
-        __traceback_info__=(`self`, `self.p_self()`, `self.id`, `self.xml_namespace()`, `hasattr(self.p_self(), '__propsets__')`)
+        # Some ZClass instances dont seem to have an _properties, so
+        # we have to fake it...
         return self.p_self()._properties
 
 
+
+
     def _propdict(self):
         dict={}
         for p in self.propertyMap():
@@ -537,13 +540,14 @@ class PropertySheets(Implicit, App.Management.Tabs):
     
     id='propertysheets'
 
-    default=DefaultProperties()
     webdav =DAVProperties()
-
+    def _get_defaults(self):
+        return (self.webdav,)
+    
     def __propsets__(self):
         propsets=self.aq_parent.__propsets__
         __traceback_info__= propsets, type(propsets)
-        return (self.default, self.webdav) + propsets
+        return self._get_defaults() + propsets
 
     def __bobo_traverse__(self, REQUEST, name=None):
         for propset in self.__propsets__():
@@ -631,6 +635,15 @@ class PropertySheets(Implicit, App.Management.Tabs):
             self, script, path)
 
 
+class DefaultPropertySheets(PropertySheets):
+    """A PropertySheets container that contains a default property
+       sheet for compatibility with the arbitrary property mgmt
+       design of Zope PropertyManagers."""
+    default=DefaultProperties()
+    webdav =DAVProperties()
+    def _get_defaults(self):
+        return (self.default, self.webdav)
+
 
 class FixedSchema(PropertySheet):