forked from DGNum/gestioCOF
Apply the new db structure to autocomplete in cof
- The autocompletion feature works again - The template is a bit more readable (indentation) - The `options` variable in the template is no longer a integer but a boolean.
This commit is contained in:
parent
859f191894
commit
68b38228a9
|
@ -5,8 +5,7 @@ from ldap3 import Connection
|
||||||
from django import shortcuts
|
from django import shortcuts
|
||||||
from django.http import Http404
|
from django.http import Http404
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User, Group
|
||||||
from .models import CofProfile
|
|
||||||
from .decorators import buro_required
|
from .decorators import buro_required
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
|
@ -22,21 +21,20 @@ def autocomplete(request):
|
||||||
if "q" not in request.GET:
|
if "q" not in request.GET:
|
||||||
raise Http404
|
raise Http404
|
||||||
q = request.GET['q']
|
q = request.GET['q']
|
||||||
data = {
|
data = {'q': q}
|
||||||
'q': q,
|
cof_members = Group.objects.get(name="cof_members")
|
||||||
}
|
|
||||||
|
|
||||||
queries = {}
|
queries = {}
|
||||||
bits = q.split()
|
bits = q.split()
|
||||||
|
|
||||||
# Fetching data from User and Profile tables
|
# Fetching data from User and Profile tables
|
||||||
queries['members'] = CofProfile.objects.filter(is_cof=True)
|
queries['members'] = User.objects.filter(groups=cof_members)
|
||||||
queries['users'] = User.objects.filter(profile__cof__is_cof=False)
|
queries['users'] = User.objects.exclude(groups=cof_members)
|
||||||
for bit in bits:
|
for bit in bits:
|
||||||
queries['members'] = queries['members'].filter(
|
queries['members'] = queries['members'].filter(
|
||||||
Q(profile__user__first_name__icontains=bit)
|
Q(first_name__icontains=bit)
|
||||||
| Q(profile__user__last_name__icontains=bit)
|
| Q(last_name__icontains=bit)
|
||||||
| Q(profile__user__username__icontains=bit)
|
| Q(username__icontains=bit)
|
||||||
| Q(profile__login_clipper__icontains=bit))
|
| Q(profile__login_clipper__icontains=bit))
|
||||||
queries['users'] = queries['users'].filter(
|
queries['users'] = queries['users'].filter(
|
||||||
Q(first_name__icontains=bit)
|
Q(first_name__icontains=bit)
|
||||||
|
@ -47,7 +45,8 @@ def autocomplete(request):
|
||||||
|
|
||||||
# Clearing redundancies
|
# Clearing redundancies
|
||||||
usernames = (
|
usernames = (
|
||||||
set(queries['members'].values_list('login_clipper', flat='True'))
|
set(queries['members'].values_list('profile__login_clipper',
|
||||||
|
flat='True'))
|
||||||
| set(queries['users'].values_list('profile__login_clipper',
|
| set(queries['users'].values_list('profile__login_clipper',
|
||||||
flat='True'))
|
flat='True'))
|
||||||
)
|
)
|
||||||
|
@ -56,7 +55,7 @@ def autocomplete(request):
|
||||||
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]
|
for bit in bits]
|
||||||
))
|
))
|
||||||
with Connection(settings.LDAP_SERVER_URL) as conn:
|
with Connection(settings.LDAP_SERVER_URL) as conn:
|
||||||
|
@ -74,6 +73,6 @@ def autocomplete(request):
|
||||||
|
|
||||||
# Resulting data
|
# Resulting data
|
||||||
data.update(queries)
|
data.update(queries)
|
||||||
data['options'] = sum(len(query) for query in queries)
|
data['options'] = any(bool(query) for query in queries.values())
|
||||||
|
|
||||||
return shortcuts.render(request, "autocomplete_user.html", data)
|
return shortcuts.render(request, "cof/autocomplete_user.html", data)
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
{% load utils %}
|
|
||||||
<ul>
|
|
||||||
{% if members %}
|
|
||||||
<li class="autocomplete-header">Membres du COF</li>
|
|
||||||
{% for member in members %}{% if forloop.counter < 5 %}
|
|
||||||
<li class="autocomplete-value"><a href="{% url 'user-registration' member.profile.user.username %}">{{ member.profile.user|highlight_user:q }}</a></li>
|
|
||||||
{% elif forloop.counter == 5 %}<li class="autocomplete-more">...</a>{% endif %}{% endfor %}
|
|
||||||
{% endif %}
|
|
||||||
{% if users %}
|
|
||||||
<li class="autocomplete-header">Utilisateurs de GestioCOF</li>
|
|
||||||
{% for user in users %}{% if forloop.counter < 5 %}
|
|
||||||
<li class="autocomplete-value"><a href="{% url 'user-registration' user.username %}">{{ user|highlight_user:q }}</a></li>
|
|
||||||
{% elif forloop.counter == 5 %}<li class="autocomplete-more">...</a>{% endif %}{% endfor %}
|
|
||||||
{% endif %}
|
|
||||||
{% if clippers %}
|
|
||||||
<li class="autocomplete-header">Utilisateurs <tt>clipper</tt></li>
|
|
||||||
{% for clipper in clippers %}{% if forloop.counter < 5 %}
|
|
||||||
<li class="autocomplete-value"><a href="{% url 'clipper-registration' clipper.clipper clipper.fullname %}">{{ clipper|highlight_clipper:q }}</a></li>
|
|
||||||
{% elif forloop.counter == 5 %}<li class="autocomplete-more">...</a>{% endif %}{% endfor %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if not options %}
|
|
||||||
<li class="autocomplete-header">Aucune correspondance trouvée</li>
|
|
||||||
{% else %}
|
|
||||||
<li class="autocomplete-header">Pas dans la liste ?</li>
|
|
||||||
{% endif %}
|
|
||||||
<li><a href="{% url 'empty-registration' %}">Créer un compte</a></li>
|
|
||||||
|
|
||||||
</ul>
|
|
57
cof/templates/cof/autocomplete_user.html
Normal file
57
cof/templates/cof/autocomplete_user.html
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
{% load utils %}
|
||||||
|
<ul>
|
||||||
|
{% if members %}
|
||||||
|
<li class="autocomplete-header">Membres du COF</li>
|
||||||
|
|
||||||
|
{% for member in members %}
|
||||||
|
{% if forloop.counter < 5 %}
|
||||||
|
<li class="autocomplete-value">
|
||||||
|
<a href="{% url 'user-registration' member.username %}">
|
||||||
|
{{ member|highlight_user:q }}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% elif forloop.counter == 5 %}
|
||||||
|
<li class="autocomplete-more">...</li>
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if users %}
|
||||||
|
<li class="autocomplete-header">Utilisateurs de GestioCOF</li>
|
||||||
|
|
||||||
|
{% for user in users %}
|
||||||
|
{% if forloop.counter < 5 %}
|
||||||
|
<li class="autocomplete-value">
|
||||||
|
<a href="{% url 'user-registration' user.username %}">
|
||||||
|
{{ user|highlight_user:q }}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% elif forloop.counter == 5 %}
|
||||||
|
<li class="autocomplete-more">...</li>
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if clippers %}
|
||||||
|
<li class="autocomplete-header">Utilisateurs <tt>clipper</tt></li>
|
||||||
|
|
||||||
|
{% for clipper in clippers %}
|
||||||
|
{% if forloop.counter < 5 %}
|
||||||
|
<li class="autocomplete-value">
|
||||||
|
<a href="{% url 'clipper-registration' clipper.clipper clipper.fullname %}">
|
||||||
|
{{ clipper|highlight_clipper:q }}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% elif forloop.counter == 5 %}
|
||||||
|
<li class="autocomplete-more">...</li>
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if not options %}
|
||||||
|
<li class="autocomplete-header">Aucune correspondance trouvée</li>
|
||||||
|
{% else %}
|
||||||
|
<li class="autocomplete-header">Pas dans la liste ?</li>
|
||||||
|
{% endif %}
|
||||||
|
<li><a href="{% url 'empty-registration' %}">Créer un compte</a></li>
|
||||||
|
</ul>
|
Loading…
Reference in a new issue