From 0ba8754d1fdadb54652050d81c1eb162fae40441 Mon Sep 17 00:00:00 2001 From: Jean-Paul Smets <jp@nexedi.com> Date: Fri, 16 Jul 2004 17:13:08 +0000 Subject: [PATCH] stat_query renamed to selection_expression git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1216 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5Catalog/CatalogTool.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/product/ERP5Catalog/CatalogTool.py b/product/ERP5Catalog/CatalogTool.py index 6c893817cd..6aa0a0eb64 100755 --- a/product/ERP5Catalog/CatalogTool.py +++ b/product/ERP5Catalog/CatalogTool.py @@ -72,7 +72,7 @@ class IndexableObjectWrapper(CMFCoreIndexableObjectWrapper): allowed[r] = 1 if withgroups: localroles = mergedLocalRoles(ob, withgroups=1) - LOG("allowedRolesAndUsers",0,str(allowed.keys())) + #LOG("allowedRolesAndUsers",0,str(allowed.keys())) else: # CMF localroles = _mergedLocalRoles(ob) @@ -91,7 +91,7 @@ class IndexableObjectWrapper(CMFCoreIndexableObjectWrapper): allowed['user:' + user + ':' + role] = 1 if allowed.has_key('Owner'): del allowed['Owner'] - LOG("allowedRolesAndUsers",0,str(allowed.keys())) + #LOG("allowedRolesAndUsers",0,str(allowed.keys())) return list(allowed.keys()) class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool): @@ -349,7 +349,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool): #kw[ 'effective' ] = { 'query' : now, 'range' : 'max' } #kw[ 'expires' ] = { 'query' : now, 'range' : 'min' } - LOG("search allowedRolesAndUsers",0,str(kw[ 'allowedRolesAndUsers' ])) + #LOG("search allowedRolesAndUsers",0,str(kw[ 'allowedRolesAndUsers' ])) return apply(ZCatalog.searchResults, (self, REQUEST), kw) __call__ = searchResults @@ -378,7 +378,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool): # Forget about permissions in statistics # (we should not count lines more than once - if kw.has_key('stat_query'): del kw[ 'allowedRolesAndUsers' ] + if kw.has_key('select_expression'): del kw[ 'allowedRolesAndUsers' ] @@ -399,7 +399,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool): else: vars = {} w = IndexableObjectWrapper(vars, object) - LOG("IndexableObjectWrapper", 0,str(w.allowedRolesAndUsers())) + #LOG("IndexableObjectWrapper", 0,str(w.allowedRolesAndUsers())) #try: ZCatalog.catalog_object(self, w, uid, idxs=idxs, is_object_moved=is_object_moved) #except: -- 2.30.9