From 064b817f2c28e26145b67d2a2c19c1db6872c573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Thu, 12 Apr 2012 13:34:49 +0000
Subject: [PATCH] Fixup 8b4a67a6a84f25e70c2f99222cd4e6fb079231d1
Allow recurse calls with uid, just disallow in public method.
---
product/ERP5Catalog/CatalogTool.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/product/ERP5Catalog/CatalogTool.py b/product/ERP5Catalog/CatalogTool.py
index 96561fb0ae..168e05513f 100644
--- a/product/ERP5Catalog/CatalogTool.py
+++ b/product/ERP5Catalog/CatalogTool.py
@@ -883,9 +883,6 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
'activate_kw' may specify an active process to collect results.
"""
- if 'uid' in kw:
- raise TypeError("'uid' cannot be used to select documents as it is "
- "used internally")
catalog_kw = dict(kw)
packet_size = catalog_kw.pop('packet_size', 30)
limit = packet_size * catalog_kw.pop('activity_count', 100)
@@ -913,6 +910,9 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
security.declarePublic('searchAndActivate')
def searchAndActivate(self, *args, **kw):
"""Restricted version of _searchAndActivate"""
+ if 'uid' in kw:
+ raise TypeError("'uid' cannot be used to select documents as it is "
+ "used internally")
return self._searchAndActivate(restricted=True, *args, **kw)
InitializeClass(CatalogTool)
--
2.30.9