Index: CatalogTool.py =================================================================== --- CatalogTool.py (Revision 38302) +++ CatalogTool.py (working copy) @@ -15,7 +15,7 @@ $Id$ """
-from AccessControl import ClassSecurityInfo +from AccessControl import ClassSecurityInfo,getSecurityManager from AccessControl.PermissionRole import rolesForPermissionOn from DateTime import DateTime from Globals import DTMLFile @@ -275,7 +275,14 @@ query = (lo, hi) range = 'min:max' kw[k] = {'query': query, 'range': range} + else: + eo = getSecurityManager()._context.stack[-1] + proxy_roles = getattr(eo,'_proxy_roles',None) + if proxy_roles: + for r in proxy_roles: + kw['allowedRolesAndUsers'].append(r)
+ return ZCatalog.searchResults(self, REQUEST, **kw)
__call__ = searchResults
Index: CatalogTool.py ======= ======= ======= ======= ======= ======= ======= ======= ====
=======
--- CatalogTool.py (Revision 38302)
+++ CatalogTool.py (working copy)
@@ -15,7 +15,7 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo fo,getSecurityM anager PermissionRole import rolesForPermiss ionOn
query = (lo, hi)
range = 'min:max'
kw[k] = {'query': query, 'range': range} ger()._ context. stack[- 1] eo,'_proxy_ roles', None) sAndUsers' ].append( r)
+from AccessControl import ClassSecurityIn
from AccessControl.
from DateTime import DateTime
from Globals import DTMLFile
@@ -275,7 +275,14 @@
+ else:
+ eo = getSecurityMana
+ proxy_roles = getattr(
+ if proxy_roles:
+ for r in proxy_roles:
+ kw['allowedRole
+ searchResults( self, REQUEST, **kw)
return ZCatalog.
__call__ = searchResults