rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-23 11:53:12 +00:00
Code Issues Releases Wiki Activity

Fix bug affichage club dans la recherche

Browse source
This commit is contained in:
Gabriel Detraz 2018-03-18 01:50:51 +01:00 committed by root
parent 8ce44ee2af
commit d9c68e0978
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
search/templates/search/index.html
View file

@ -32,6 +32,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<h2>Résultats dans les utilisateurs</h2>
{% include "users/aff_users.html" with users_list=users %}
{% endif%}
{% if clubs %}
<h2>Résultats dans les clubs</h2>
{% include "users/aff_clubs.html" with clubs_list=clubs %}
{% endif%}
{% if machines %}
<h2>Résultats dans les machines : </h2>
{% include "machines/aff_machines.html" with machines_list=machines %}

15
search/views.py
View file

@ -31,7 +31,7 @@ from django.shortcuts import render
from django.contrib.auth.decorators import login_required
from django.db.models import Q
from users.models import User, Ban, Whitelist
from users.models import User, Adherent, Club, Ban, Whitelist
from machines.models import Machine
from topologie.models import Port, Switch, Room
from cotisations.models import Facture
@ -133,19 +133,20 @@ def search_single_word(word, filters, user,
filter_users = (
Q(
surname__icontains=word
) | Q(
adherent__name__icontains=word
) | Q(
pseudo__icontains=word
) | Q(
club__room__name__icontains=word
room__name__icontains=word
) | Q(
adherent__room__name__icontains=word
room__name__icontains=word
)
) & Q(state__in=user_state)
if not User.can_view_all(user)[0]:
filter_users &= Q(id=user.id)
filter_clubs = filter_users
filter_users |= Q(name__icontains=word)
filters['users'] |= filter_users
filters['clubs'] |= filter_clubs
# Machines
if '1' in aff:
@ -359,6 +360,7 @@ def get_results(query, request, params):
filters = {
'users': Q(),
'clubs': Q(),
'machines': Q(),
'factures': Q(),
'bans': Q(),
@ -381,7 +383,8 @@ def get_results(query, request, params):
)
results = {
'users': User.objects.filter(filters['users']),
'users': Adherent.objects.filter(filters['users']),
'clubs': Club.objects.filter(filters['clubs']),
'machines': Machine.objects.filter(filters['machines']),
'factures': Facture.objects.filter(filters['factures']),
'bans': Ban.objects.filter(filters['bans']),