Commit c10ec219 authored by Ayush Tiwari's avatar Ayush Tiwari

multiple_catalog: Do not look in preference for the Catalog if

parent 42e0678a
...@@ -753,8 +753,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject): ...@@ -753,8 +753,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
# now = DateTime() # now = DateTime()
# kw[ 'effective' ] = { 'query' : now, 'range' : 'max' } # kw[ 'effective' ] = { 'query' : now, 'range' : 'max' }
# kw[ 'expires' ] = { 'query' : now, 'range' : 'min' } # kw[ 'expires' ] = { 'query' : now, 'range' : 'min' }
catalog_id = self.getSQLCatalog(sql_catalog_id).id
catalog_id = self.getPreferredSQLCatalogId(sql_catalog_id)
query = self.getSecurityQuery( query = self.getSecurityQuery(
sql_catalog_id=catalog_id, sql_catalog_id=catalog_id,
local_roles=local_roles, local_roles=local_roles,
...@@ -819,7 +818,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject): ...@@ -819,7 +818,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
# now = DateTime() # now = DateTime()
# #kw[ 'effective' ] = { 'query' : now, 'range' : 'max' } # #kw[ 'effective' ] = { 'query' : now, 'range' : 'max' }
# #kw[ 'expires' ] = { 'query' : now, 'range' : 'min' } # #kw[ 'expires' ] = { 'query' : now, 'range' : 'min' }
catalog_id = self.getPreferredSQLCatalogId(sql_catalog_id) catalog_id = self.getSQLCatalog(sql_catalog_id).id
query = self.getSecurityQuery( query = self.getSecurityQuery(
sql_catalog_id=catalog_id, sql_catalog_id=catalog_id,
local_roles=local_roles, local_roles=local_roles,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment