squash me

product/ERP5Catalog/CatalogTool.py

@@ -628,7 +628,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
         user_str = user_str.encode('utf-8')
       user_is_superuser = (user == system_user) or (user_str == ERP5Security.SUPER_USER)
       user_is_superuser = (user == system_user) or (user_str == ERP5Security.SUPER_USER) or \
-          ('Manager' in user.getRoles())
+          ('Manager' in user.getRoles() and local_roles is None)
       allowedRolesAndUsers = self._listAllowedRolesAndUsers(user)
       role_column_dict = {}
       local_role_column_dict = {}
@@ -754,7 +754,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
       user = _getAuthenticatedUser(self)
       user_str = user.getIdOrUserName()
       user_is_superuser = (user == system_user) or (user_str == ERP5Security.SUPER_USER) or \
-          ('Manager' in user.getRoles())
+          ('Manager' in user.getRoles() and local_roles is None)
       if user_is_superuser:
         # We need no security check for super user.
         return
@@ -1496,4 +1496,4 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
           now=now,
           **kw)
 
-InitializeClass(CatalogTool)
+InitializeClass(CatalogTool)
\ No newline at end of file