[Erp5-report] r25202 - in /erp5/trunk/products/ERP5Catalog: ./ tests/

[nobody at svn.erp5.org]

Author: romain
Date: Tue Jan 20 13:53:22 2009
New Revision: 25202

URL: http://svn.erp5.org?rev=25202&view=rev
Log:
Do not add security_uid_list if empty.

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

Modified: erp5/trunk/products/ERP5Catalog/CatalogTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/CatalogTool.py?rev=25202&r1=25201&r2=25202&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/CatalogTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Catalog/CatalogTool.py [utf8] Tue Jan 20 13:53:22 2009
@@ -596,8 +596,16 @@
         if security_uid_list:
           query = ComplexQuery(Query(security_uid=security_uid_list, operator='IN'),
                                query, operator='OR')
+      elif security_uid_list:
+        query = Query(security_uid=security_uid_list, operator='IN')
       else:
-        query = Query(security_uid=security_uid_list, operator='IN')
+        # XXX A false query has to be generated. 
+        # As it is not possible to use SQLKey for now, pass impossible value
+        # on uid (which will be detected as False by MySQL, as it is not in the
+        # column range)
+        # Do not pass security_uid_list as empty in order to prevent useless
+        # overhead
+        query = Query(uid=-1)
 
       if local_role_column_dict:
         query_list = []

Modified: erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py?rev=25202&r1=25201&r2=25202&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py [utf8] (original)
+++ erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py [utf8] Tue Jan 20 13:53:22 2009
@@ -1669,6 +1669,12 @@
     
     # if we specify local_roles= it will only returns documents on with bob has
     # a local roles
+    self.assertEquals(0,
+                len(ctool.searchResults(title='Object Title',
+                                        local_roles='UnexistingRole')))
+    self.assertEquals(0,
+                len(ctool.searchResults(title='Object Title',
+                                        local_roles='Assignor')))
     self.assertEquals(1,
                 len(ctool.searchResults(title='Object Title',
                                         local_roles='Assignee')))