diff --git a/users_ldap_groups/models/res_company_ldap.py b/users_ldap_groups/models/res_company_ldap.py index 0125181309..f4614c2518 100644 --- a/users_ldap_groups/models/res_company_ldap.py +++ b/users_ldap_groups/models/res_company_ldap.py @@ -48,7 +48,7 @@ def _get_or_create_user(self, conf, login, ldap_entry): _logger.debug("deleting all groups from user %d", user_id) groups.append((5, False, False)) for mapping in this.group_mapping_ids: - operator = getattr(op_obj, mapping.operator) + operator = getattr(op_obj, f'_{mapping.operator}') _logger.debug("checking mapping %s", mapping) if operator(ldap_entry, mapping): _logger.debug( diff --git a/users_ldap_groups/models/res_company_ldap_operator.py b/users_ldap_groups/models/res_company_ldap_operator.py index 44e7b8fd85..030a30b8f4 100644 --- a/users_ldap_groups/models/res_company_ldap_operator.py +++ b/users_ldap_groups/models/res_company_ldap_operator.py @@ -20,17 +20,17 @@ def operators(self): """Return names of function to call on this model as operator""" return ("contains", "equals", "query") - def contains(self, ldap_entry, mapping): + def _contains(self, ldap_entry, mapping): return mapping.ldap_attribute in ldap_entry[1] and mapping.value in map( lambda x: x.decode(), ldap_entry[1][mapping.ldap_attribute] ) - def equals(self, ldap_entry, mapping): + def _equals(self, ldap_entry, mapping): return mapping.ldap_attribute in ldap_entry[1] and mapping.value == str( list(map(lambda x: x.decode(), ldap_entry[1][mapping.ldap_attribute])) ) - def query(self, ldap_entry, mapping): + def _query(self, ldap_entry, mapping): query_string = Template(mapping.value).safe_substitute( { attr: self.safe_ldap_decode(ldap_entry[1][attr][0])