Commit 0ae88d7a authored by Aurel's avatar Aurel

propagate kw parameter to deleteContent methods


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@43316 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b457a2dd
...@@ -205,7 +205,7 @@ class ERP5Conduit(XMLSyncUtilsMixin): ...@@ -205,7 +205,7 @@ class ERP5Conduit(XMLSyncUtilsMixin):
#LOG('ERP5Conduit.deleteNode', INFO, 'object path:%s' % object.getPath()) #LOG('ERP5Conduit.deleteNode', INFO, 'object path:%s' % object.getPath())
#LOG('ERP5Conduit deleteNode', INFO, 'object_id:%r' % object_id) #LOG('ERP5Conduit deleteNode', INFO, 'object_id:%r' % object_id)
if object_id is not None: if object_id is not None:
self._deleteContent(object=object, object_id=object_id) self._deleteContent(object=object, object_id=object_id, kw)
return [] return []
xml = self.convertToXml(xml) xml = self.convertToXml(xml)
#LOG('ERP5Conduit deleteNode', INFO, etree.tostring(xml, pretty_print=True)) #LOG('ERP5Conduit deleteNode', INFO, etree.tostring(xml, pretty_print=True))
...@@ -218,7 +218,8 @@ class ERP5Conduit(XMLSyncUtilsMixin): ...@@ -218,7 +218,8 @@ class ERP5Conduit(XMLSyncUtilsMixin):
pass pass
elif context_to_delete != object: elif context_to_delete != object:
self._deleteContent(object=context_to_delete.getParentValue(), self._deleteContent(object=context_to_delete.getParentValue(),
object_id=context_to_delete.getId()) object_id=context_to_delete.getId(),
kw)
else: else:
#same context #same context
if [role for role in LOCAL_ROLE_LIST if role in xpath_expression]: if [role for role in LOCAL_ROLE_LIST if role in xpath_expression]:
...@@ -236,7 +237,7 @@ class ERP5Conduit(XMLSyncUtilsMixin): ...@@ -236,7 +237,7 @@ class ERP5Conduit(XMLSyncUtilsMixin):
return [] return []
security.declareProtected(Permissions.ModifyPortalContent, 'deleteObject') security.declareProtected(Permissions.ModifyPortalContent, 'deleteObject')
def deleteObject(self, object, object_id): def deleteObject(self, object, object_id, **kw):
try: try:
object._delObject(object_id) object._delObject(object_id)
except (AttributeError, KeyError): except (AttributeError, KeyError):
...@@ -1038,11 +1039,11 @@ class ERP5Conduit(XMLSyncUtilsMixin): ...@@ -1038,11 +1039,11 @@ class ERP5Conduit(XMLSyncUtilsMixin):
""" """
return self.editDocument(object=object, **args) 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 This is the method for delete the object
""" """
return self.deleteObject(object, object_id) return self.deleteObject(object, object_id, **kw)
def getContentType(self): def getContentType(self):
"""Content-Type of binded data """Content-Type of binded data
......
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