Commit b5dda8b9 authored by 's avatar

- removed fallback isAnObjectManager check

parent dfb4fc05
...@@ -73,6 +73,12 @@ Zope Changes ...@@ -73,6 +73,12 @@ Zope Changes
- Improved test runner. Run test.py with -h to find out more. - Improved test runner. Run test.py with -h to find out more.
Bugs Fixed
- OFS PropertySheets / webdav: Fixed dav__resourcetype.
__dav_collection__ with a false value was overridden by
isAnObjectManager.
Other Other
- ZSQLMethod.manage_main: Moved the error message that warns of a - ZSQLMethod.manage_main: Moved the error message that warns of a
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE # FOR A PARTICULAR PURPOSE.
# #
############################################################################## ##############################################################################
"""Property sheets """Property sheets
...@@ -533,8 +533,7 @@ class DAVProperties(Virtual, PropertySheet, View): ...@@ -533,8 +533,7 @@ class DAVProperties(Virtual, PropertySheet, View):
def dav__resourcetype(self): def dav__resourcetype(self):
vself=self.v_self() vself=self.v_self()
if (isDavCollection(vself) or if isDavCollection(vself):
getattr(aq_base(vself), 'isAnObjectManager', None)):
return '<n:collection/>' return '<n:collection/>'
return '' return ''
......
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