|
|
@ -41,20 +41,19 @@ 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 = [] |
|
|
|
|
|
|
|
|
|
|
|
recherche = {'users_list': None, 'machines_list' : None, 'facture_list' : None, 'ban_list' : None, 'white_list': None, 'port_list': None, 'switch_list': None} |
|
|
recherche = {'users_list': None, 'machines_list' : None, 'facture_list' : None, 'ban_list' : None, 'white_list': None, 'port_list': None, 'switch_list': None} |
|
|
|
|
|
|
|
|
query = Q(user__pseudo__icontains = search) | Q(user__name__icontains = search) | Q(user__surname__icontains = search) |
|
|
query = Q(user__pseudo__icontains = search) | Q(user__name__icontains = search) | Q(user__surname__icontains = search) |
|
|
|
|
|
|
|
|
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': |
|
|
|