Commit f2e2bb05 authored by Vincent Pelletier's avatar Vincent Pelletier

ERP5Catalog: Do not forcibly pass a "query" parameter to catalog.

Likewise for positional REQUEST parameter.
parent d3fc1558
...@@ -667,36 +667,36 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject): ...@@ -667,36 +667,36 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
__call__ = searchResults __call__ = searchResults
security.declarePrivate('unrestrictedSearchResults') security.declarePrivate('unrestrictedSearchResults')
def unrestrictedSearchResults(self, REQUEST=None, **kw): def unrestrictedSearchResults(self, **kw):
"""Calls ZSQLCatalog.searchResults directly without restrictions. """Calls ZSQLCatalog.searchResults directly without restrictions.
""" """
kw.setdefault('limit', self.default_result_limit) kw.setdefault('limit', self.default_result_limit)
return ZCatalog.searchResults(self, REQUEST, **kw) return ZCatalog.searchResults(self, **kw)
# We use a string for permissions here due to circular reference in import # We use a string for permissions here due to circular reference in import
# from ERP5Type.Permissions # from ERP5Type.Permissions
security.declareProtected('Search ZCatalog', 'getResultValue') security.declareProtected('Search ZCatalog', 'getResultValue')
def getResultValue(self, query=None, **kw): def getResultValue(self, **kw):
""" """
A method to factor common code used to search a single A method to factor common code used to search a single
object in the database. object in the database.
""" """
kw.setdefault('limit', 1) kw.setdefault('limit', 1)
result = self.searchResults(query=query, **kw) result = self.searchResults(**kw)
try: try:
return result[0].getObject() return result[0].getObject()
except IndexError: except IndexError:
return None return None
security.declarePrivate('unrestrictedGetResultValue') security.declarePrivate('unrestrictedGetResultValue')
def unrestrictedGetResultValue(self, query=None, **kw): def unrestrictedGetResultValue(self, **kw):
""" """
A method to factor common code used to search a single A method to factor common code used to search a single
object in the database. Same as getResultValue but without object in the database. Same as getResultValue but without
taking into account security. taking into account security.
""" """
kw.setdefault('limit', 1) kw.setdefault('limit', 1)
result = self.unrestrictedSearchResults(query=query, **kw) result = self.unrestrictedSearchResults(**kw)
try: try:
return result[0].getObject() return result[0].getObject()
except IndexError: except IndexError:
......
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