Commit 0e4cda5e authored by Łukasz Nowak's avatar Łukasz Nowak Committed by Alain Takoudjou

Ignore manually deleted subobjects.

Conflicts:

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