multiple_catalog: Do not look in preference for the Catalog if

c10ec219 · Ayush Tiwari · 42e0678a · c10ec219
Commit c10ec219 authored Nov 16, 2016 by Ayush Tiwari
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

product/ERP5Catalog/CatalogTool.py product/ERP5Catalog/CatalogTool.py +2 -3

No files found.
--- a/product/ERP5Catalog/CatalogTool.py
+++ b/product/ERP5Catalog/CatalogTool.py
@@ -753,8 +753,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
        #    now = DateTime()
        #    kw[ 'effective' ] = { 'query' : now, 'range' : 'max' }
        #    kw[ 'expires'   ] = { 'query' : now, 'range' : 'min' }
-
-        catalog_id = self.getPreferredSQLCatalogId(sql_catalog_id)
+        catalog_id = self.getSQLCatalog(sql_catalog_id).id
        query = self.getSecurityQuery(
          sql_catalog_id=catalog_id,
          local_roles=local_roles,
@@ -819,7 +818,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
        #    now = DateTime()
        #    #kw[ 'effective' ] = { 'query' : now, 'range' : 'max' }
        #    #kw[ 'expires'   ] = { 'query' : now, 'range' : 'min' }
-        catalog_id = self.getPreferredSQLCatalogId(sql_catalog_id)
+        catalog_id = self.getSQLCatalog(sql_catalog_id).id
        query = self.getSecurityQuery(
          sql_catalog_id=catalog_id,
          local_roles=local_roles,