cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Change ldap query behaviour if multiple inputs

Browse source 
It is now consistent with the other lookups over the User database
This commit is contained in:
Martin Pépin 2017-03-19 15:06:41 +00:00
parent dc50a23b10
commit 74f0b63e96
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gestioncof/autocomplete.py
View file

@ -56,8 +56,8 @@ def autocomplete(request):
# Fetching data from the SPI # Fetching data from the SPI
if hasattr(settings, 'LDAP_SERVER_URL'): if hasattr(settings, 'LDAP_SERVER_URL'):
# Fetching # Fetching
ldap_query = '(|{:s})'.format(''.join( ldap_query = '(&{:s})'.format(''.join(
'(cn=*{bit:s}*)(uid=*{bit:s}*)'.format(bit=bit) '(|(cn=*{bit:s}*)(uid=*{bit:s}*))'.format(bit=bit)
for bit in bits if bit.isalnum() for bit in bits if bit.isalnum()
)) ))
if ldap_query != "(|)": if ldap_query != "(|)":

4
kfet/autocomplete.py
View file

@ -75,8 +75,8 @@ def account_create(request):
# Fetching data from the SPI # Fetching data from the SPI
if hasattr(settings, 'LDAP_SERVER_URL'): if hasattr(settings, 'LDAP_SERVER_URL'):
# Fetching # Fetching
ldap_query = '(|{:s})'.format(''.join( ldap_query = '(&{:s})'.format(''.join(
'(cn=*{bit:s}*)(uid=*{bit:s}*)'.format(bit=word) '(|(cn=*{bit:s}*)(uid=*{bit:s}*))'.format(bit=word)
for word in search_words if word.isalnum() for word in search_words if word.isalnum()
)) ))
if ldap_query != "(|)": if ldap_query != "(|)":