Commit 569a3250 authored by Vincent Pelletier's avatar Vincent Pelletier

It is valid to unindex an object without providing it (eg, an object is...

It is valid to unindex an object without providing it (eg, an object is indexed but does not exist any more), so make "object" parameter optionnal.
Add a test to check that at least one way to find an object to unindex is given.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16225 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 76206497
...@@ -711,10 +711,12 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject): ...@@ -711,10 +711,12 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
security.declarePrivate('unindexObject') security.declarePrivate('unindexObject')
def unindexObject(self, object, path=None, uid=None,sql_catalog_id=None): def unindexObject(self, object=None, path=None, uid=None,sql_catalog_id=None):
""" """
Remove from catalog. Remove from catalog.
""" """
if path is None and uid is None and object is None:
raise TypeError, 'One of uid, path and object parameters must not be None'
if path is None and uid is None: if path is None and uid is None:
path = self.__url(object) path = self.__url(object)
self.uncatalog_object(path=path,uid=uid, sql_catalog_id=sql_catalog_id) self.uncatalog_object(path=path,uid=uid, sql_catalog_id=sql_catalog_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