Collector #905: Locked objects can no longer be renamed

doc/CHANGES.txt

@@ -80,9 +80,9 @@ Zope Changes
        This restricts access to the Control_Panel and especially
        to the Products management to trusted users.
 
-     - Cut & Delete operations on locked objects (WebDAV) are no longer
-       permitted and will raise an exception. Copies of locked objects
-       are copied without lock.
+     - Rename, Cut & Delete operations on locked objects (WebDAV) are 
+       no longer permitted and will raise an exception. Copies of 
+       locked objects are copied without lock.
 
      - Collector #634: Image objects can now be rendered without border
        attribute by calling "image.tag(border='')".

lib/python/OFS/CopySupport.py

@@ -11,7 +11,7 @@
 #
 ##############################################################################
 __doc__="""Copy interface"""
-__version__='$Revision: 1.84 $'[11:-2]
+__version__='$Revision: 1.85 $'[11:-2]
 
 import sys,  Globals, Moniker, tempfile, ExtensionClass
 from marshal import loads, dumps
@@ -237,6 +237,8 @@ class CopyContainer(ExtensionClass.Base):
                       message=sys.exc_info()[1],
                       action ='manage_main')
         ob=self._getOb(id)
+        if ob.wl_isLocked():
+            raise ResourceLockedError, 'Object "%s" is locked via WebDAV' % ob.getId()
         if not ob.cb_isMoveable():
             raise CopyError, eNotSupported % id
         self._verifyObjectPaste(ob)