Commit bf1ee86c authored by Sidnei da Silva's avatar Sidnei da Silva

Apply patch by Josh LaPlace. Makes DAV 'supportedlock' actually check if the...

Apply patch by Josh LaPlace. Makes DAV 'supportedlock' actually check if the object implements the WriteLockInterface.
parent 8a032f95
...@@ -103,6 +103,13 @@ Zope Changes ...@@ -103,6 +103,13 @@ Zope Changes
Bugs fixed Bugs fixed
- WebDAV property values were not being properly escaped on
'propstat'.
- WebDAV 'supportedlock' was not checking if the object did
implement the WriteLockInterface before returning it's
value.
- reStructuredText ignored the encoding settings in zope.conf - reStructuredText ignored the encoding settings in zope.conf
- ObjectManager no longer raises string exceptions - ObjectManager no longer raises string exceptions
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
"""Property sheets""" """Property sheets"""
__version__='$Revision: 1.94 $'[11:-2] __version__='$Revision: 1.95 $'[11:-2]
import time, App.Management, Globals, sys import time, App.Management, Globals, sys
from webdav.WriteLockInterface import WriteLockInterface from webdav.WriteLockInterface import WriteLockInterface
...@@ -565,10 +565,14 @@ class DAVProperties(Virtual, PropertySheet, View): ...@@ -565,10 +565,14 @@ class DAVProperties(Virtual, PropertySheet, View):
return '' return ''
def dav__supportedlock(self): def dav__supportedlock(self):
return '\n <n:lockentry>\n' \ vself = self.v_self()
' <d:lockscope><d:exclusive/></d:lockscope>\n' \ out = '\n'
' <d:locktype><d:write/></d:locktype>\n' \ if WriteLockInterface.isImplementedBy(vself):
' </n:lockentry>\n ' out += (' <n:lockentry>\n'
' <d:lockscope><d:exclusive/></d:lockscope>\n'
' <d:locktype><d:write/></d:locktype>\n'
' </n:lockentry>\n ')
return out
def dav__lockdiscovery(self): def dav__lockdiscovery(self):
security = getSecurityManager() security = getSecurityManager()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment