rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-02 09:32:26 +00:00
Code Issues Releases Wiki Activity

Normalement ca devrait remarcher ce que je voulais faire remarcher

Browse source
This commit is contained in:
Dalahro 2016-11-02 00:52:56 +01:00
parent 6d5a7267c1
commit 42dc0bf71b
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
search/views.py
View file

@ -41,10 +41,9 @@ def search_result(search, type, request):
if date_fin != None: if date_fin != None:
date_query = date_query & Q(date__lte=date_fin) date_query = date_query & Q(date__lte=date_fin)
search = search.cleaned_data['search_field'] search = search.cleaned_data['search_field']
query = Q() query1 = Q()
for s in states: for s in states:
query = query | Q(state = s) query1 = query1 | Q(state = s)
connexion = [] connexion = []
@ -54,7 +53,7 @@ def search_result(search, type, request):
for i in aff: for i in aff:
if i == '0': if i == '0':
recherche['users_list'] = User.objects.filter(Q(pseudo__icontains = search) | Q(name__icontains = search) | Q(surname__icontains = search)) recherche['users_list'] = User.objects.filter((Q(pseudo__icontains = search) | Q(name__icontains = search) | Q(surname__icontains = search)) & query1)
if i == '1': if i == '1':
recherche['machines_list'] = Machine.objects.filter(query | Q(interface__dns__icontains = search) | Q(interface__mac_address__icontains = search)) recherche['machines_list'] = Machine.objects.filter(query | Q(interface__dns__icontains = search) | Q(interface__mac_address__icontains = search))
if i == '2': if i == '2':