Commit 159b93ba authored by Łukasz Nowak's avatar Łukasz Nowak Committed by Rafael Monnerat

Ignore manually deleted subobjects.

Conflicts:

	product/ERP5/Document/BusinessTemplate.py
parent e9f88611
......@@ -1323,7 +1323,10 @@ class ObjectTemplateItem(BaseTemplateItem):
document_id = document.getId()
self._backupObject(action, trashbin, path.split('/')[:-1],
document_id)
parent.manage_delObjects([document_id])
try:
parent.manage_delObjects([document_id])
except BadRequest:
pass # removed manually
self.afterInstall()
......
......@@ -83,7 +83,7 @@ class TrashTool(BaseTool):
if object_id not in backup_object_container.objectIds():
# export object
object_path = container_path + [object_id]
obj = self.unrestrictedTraverse(object_path)
obj = self.unrestrictedTraverse(object_path, None)
if obj is not None:
connection = obj._p_jar
o = obj
......@@ -139,11 +139,10 @@ class TrashTool(BaseTool):
if not keep_sub:
# export subobjects
if save:
obj = backup_object_container._getOb(object_id)
object_path = list(obj.getPhysicalPath())
obj = backup_object_container._getOb(object_id, None)
else:
object_path = container_path + [object_id]
obj = self.unrestrictedTraverse(object_path)
obj = self.unrestrictedTraverse(object_path, None)
if obj is not None:
for subobject_id in list(obj.objectIds()):
subobject = obj[subobject_id]
......
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