[Erp5-report] r26467 - /erp5/trunk/products/ERP5Catalog/CatalogTool.py

[nobody at svn.erp5.org]

Author: yo
Date: Fri Apr 17 05:37:55 2009
New Revision: 26467

URL: http://svn.erp5.org?rev=26467&view=rev
Log:
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.

Modified:
    erp5/trunk/products/ERP5Catalog/CatalogTool.py

Modified: erp5/trunk/products/ERP5Catalog/CatalogTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/CatalogTool.py?rev=26467&r1=26466&r2=26467&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/CatalogTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Catalog/CatalogTool.py [utf8] Fri Apr 17 05:37:55 2009
@@ -676,11 +676,11 @@
         Calls ZCatalog.searchResults with extra arguments that
         limit the results to what the user is allowed to see.
         """
-        if not _checkPermission(
-            Permissions.AccessInactivePortalContent, self):
-            now = DateTime()
-            kw[ 'effective' ] = { 'query' : now, 'range' : 'max' }
-            kw[ 'expires'   ] = { 'query' : now, 'range' : 'min' }
+        #if not _checkPermission(
+        #    Permissions.AccessInactivePortalContent, self):
+        #    now = DateTime()
+        #    kw[ 'effective' ] = { 'query' : now, 'range' : 'max' }
+        #    kw[ 'expires'   ] = { 'query' : now, 'range' : 'min' }
 
         catalog_id = self.getPreferredSQLCatalogId(kw.pop("sql_catalog_id", None))
         query = self.getSecurityQuery(query=query, sql_catalog_id=catalog_id, **kw)