Render broken objects + allow to delete them.

zopefoundation · Jun 12, 2018 · 7ebdd63 · 7ebdd63
1 parent 7b7e7dd
commit 7ebdd63
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git 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
@@ -59,10 +59,12 @@
                      tal:attributes="value id" />
             </td>
             <td>
-              <span tal:attributes="class ob/zmi_icon;
-                                    title ob/meta_type">
+              <span title="Broken object"
+                    class="icon-broken"
+                    tal:attributes="class ob/zmi_icon | default;
+                                    title ob/meta_type | default">
                 <span class="sr-only"
-                      tal:content="ob/meta_type">meta_type</span>
+                      tal:content="ob/meta_type | default">Broken object</span>
               </span>
             </td>
             <td>
@@ -74,7 +76,7 @@
               </span>
             </td>
             <td>
-              <a tal:condition="ob/title"
+              <a tal:condition="ob/title|nothing"
                  tal:attributes="href string:${id}/manage_workspace"
                  tal:content="ob/title">Title</a>
             </td>