diff --git a/product/ERP5Security/ERP5GroupManager.py b/product/ERP5Security/ERP5GroupManager.py index c65ee583bbcc75084eb4b944584b5bf8f4bccda4..4d1a757fc055593531c620f2c2f04fcee05159b8 100755 --- a/product/ERP5Security/ERP5GroupManager.py +++ b/product/ERP5Security/ERP5GroupManager.py @@ -68,7 +68,7 @@ class ERP5GroupManager(BasePlugin): # because we aren't logged in, we have to create our own # SecurityManager to be able to access the Catalog newSecurityManager(self, self.getPortalObject().getOwner()) - base_category_list = self.getPortalObject().getPortalAssignmentsBaseCategoryList() + base_category_list = self.getPortalObject().getPortalAssignmentBaseCategoryList() user_name = principal.getId() diff --git a/product/ERP5Security/ERP5UserManager.py b/product/ERP5Security/ERP5UserManager.py index d622ea80ca314d7cffc289adc72ba06bf1f1e40f..8542d60b9f7c56ff9b60e4c431d09cf203cf11be 100755 --- a/product/ERP5Security/ERP5UserManager.py +++ b/product/ERP5Security/ERP5UserManager.py @@ -107,10 +107,13 @@ class ERP5UserManager(BasePlugin): for user_name in t_id: user = getattr(person_module, user_name, None) if user: - user_objects.append(user) + if user.getCareerRole() == 'internal': + user_objects.append(user) elif login: - user_objects.extend(self.getUserByLogin(login)) + for user in self.getUserByLogin(login): + if user.getCareerRole() == 'internal': + user_objects.append(user) for user in user_objects: LOG('enumerateUsers', 0, user.getId())