Commit 9502d2cc authored by Yoshinori Okuji's avatar Yoshinori Okuji

Disable adding effective and expires automatically in searchResults. This is...

Disable adding effective and expires automatically in searchResults. This is consistent with countResults, and these parameters are ignored anyway, as the catalog does not have such columns.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26467 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ff3f17be
...@@ -676,11 +676,11 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject): ...@@ -676,11 +676,11 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
Calls ZCatalog.searchResults with extra arguments that Calls ZCatalog.searchResults with extra arguments that
limit the results to what the user is allowed to see. limit the results to what the user is allowed to see.
""" """
if not _checkPermission( #if not _checkPermission(
Permissions.AccessInactivePortalContent, self): # Permissions.AccessInactivePortalContent, self):
now = DateTime() # now = DateTime()
kw[ 'effective' ] = { 'query' : now, 'range' : 'max' } # kw[ 'effective' ] = { 'query' : now, 'range' : 'max' }
kw[ 'expires' ] = { 'query' : now, 'range' : 'min' } # kw[ 'expires' ] = { 'query' : now, 'range' : 'min' }
catalog_id = self.getPreferredSQLCatalogId(kw.pop("sql_catalog_id", None)) catalog_id = self.getPreferredSQLCatalogId(kw.pop("sql_catalog_id", None))
query = self.getSecurityQuery(query=query, sql_catalog_id=catalog_id, **kw) query = self.getSecurityQuery(query=query, sql_catalog_id=catalog_id, **kw)
......
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