Commit 3f9b0548 authored by Vincent Pelletier's avatar Vincent Pelletier

Fix obviously bogus code path.

Do not prevent security from being generated when allowedRolesAndUsers returns a "false" value (empty list).


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15334 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e7584a95
...@@ -486,11 +486,8 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject): ...@@ -486,11 +486,8 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
else: else:
query = Query(allowedRolesAndUsers=allowedRolesAndUsers) query = Query(allowedRolesAndUsers=allowedRolesAndUsers)
else: else:
if allowedRolesAndUsers: allowedRolesAndUsers = ["'%s'" % (role, ) for role in allowedRolesAndUsers]
allowedRolesAndUsers = ["'%s'" % (role, ) for role in allowedRolesAndUsers] security_uid_list = [x.uid for x in method(security_roles_list = allowedRolesAndUsers)]
security_uid_list = [x.uid for x in method(security_roles_list = allowedRolesAndUsers)]
if len(security_uid_list) == 0:
security_uid_list = None
if role_column_dict: if role_column_dict:
query_list = [] query_list = []
for key, value in role_column_dict.items(): for key, value in role_column_dict.items():
...@@ -498,9 +495,8 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject): ...@@ -498,9 +495,8 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
query_list.append(new_query) query_list.append(new_query)
operator_kw = {'operator': 'AND'} operator_kw = {'operator': 'AND'}
query = ComplexQuery(*query_list, **operator_kw) query = ComplexQuery(*query_list, **operator_kw)
if allowedRolesAndUsers and security_uid_list: query = ComplexQuery(Query(security_uid=security_uid_list, operator='IN'),
query = ComplexQuery(Query(security_uid=security_uid_list, operator='IN'), query, operator='OR')
query, operator='OR')
else: else:
query = Query(security_uid=security_uid_list, operator='IN') query = Query(security_uid=security_uid_list, operator='IN')
if original_query is not None: if original_query is not None:
......
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