From 0ae88d7a7d5e366f6bcd00463baa72a14c86768b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com>
Date: Mon, 14 Feb 2011 14:07:14 +0000
Subject: [PATCH] propagate kw parameter to deleteContent methods
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@43316 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5SyncML/Conduit/ERP5Conduit.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/product/ERP5SyncML/Conduit/ERP5Conduit.py b/product/ERP5SyncML/Conduit/ERP5Conduit.py
index e0fdb7f72b..2318cb1479 100644
--- a/product/ERP5SyncML/Conduit/ERP5Conduit.py
+++ b/product/ERP5SyncML/Conduit/ERP5Conduit.py
@@ -205,7 +205,7 @@ class ERP5Conduit(XMLSyncUtilsMixin):
#LOG('ERP5Conduit.deleteNode', INFO, 'object path:%s' % object.getPath())
#LOG('ERP5Conduit deleteNode', INFO, 'object_id:%r' % object_id)
if object_id is not None:
- self._deleteContent(object=object, object_id=object_id)
+ self._deleteContent(object=object, object_id=object_id, kw)
return []
xml = self.convertToXml(xml)
#LOG('ERP5Conduit deleteNode', INFO, etree.tostring(xml, pretty_print=True))
@@ -218,7 +218,8 @@ class ERP5Conduit(XMLSyncUtilsMixin):
pass
elif context_to_delete != object:
self._deleteContent(object=context_to_delete.getParentValue(),
- object_id=context_to_delete.getId())
+ object_id=context_to_delete.getId(),
+ kw)
else:
#same context
if [role for role in LOCAL_ROLE_LIST if role in xpath_expression]:
@@ -236,7 +237,7 @@ class ERP5Conduit(XMLSyncUtilsMixin):
return []
security.declareProtected(Permissions.ModifyPortalContent, 'deleteObject')
- def deleteObject(self, object, object_id):
+ def deleteObject(self, object, object_id, **kw):
try:
object._delObject(object_id)
except (AttributeError, KeyError):
@@ -1038,11 +1039,11 @@ class ERP5Conduit(XMLSyncUtilsMixin):
"""
return self.editDocument(object=object, **args)
- def _deleteContent(self, object=None, object_id=None):
+ def _deleteContent(self, object=None, object_id=None, **kw):
"""
This is the method for delete the object
"""
- return self.deleteObject(object, object_id)
+ return self.deleteObject(object, object_id, **kw)
def getContentType(self):
"""Content-Type of binded data
--
2.30.9