diff --git a/src/OFS/ObjectManager.py b/src/OFS/ObjectManager.py index f8a76e8a92..a383941db5 100644 --- a/src/OFS/ObjectManager.py +++ b/src/OFS/ObjectManager.py @@ -540,9 +540,12 @@ def manage_delObjects(self, ids=[], REQUEST=None): id = ids[-1] v = self._getOb(id, self) - if v.wl_isLocked(): - raise ResourceLockedError( - 'Object "%s" is locked.' % v.getId()) + try: + if v.wl_isLocked(): + raise ResourceLockedError( + 'Object "%s" is locked.' % v.getId()) + except AttributeError: + pass if v is self: raise BadRequest('%s does not exist' % escape(ids[-1], True)) diff --git a/src/OFS/zpt/main.zpt b/src/OFS/zpt/main.zpt index 8f3e3a1bb7..ced5773115 100644 --- a/src/OFS/zpt/main.zpt +++ b/src/OFS/zpt/main.zpt @@ -59,10 +59,12 @@ tal:attributes="value id" /> - + meta_type + tal:content="ob/meta_type | default">Broken object @@ -74,7 +76,7 @@ - Title