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

Fix les affichages mutliples dans la recherche

Browse source
This commit is contained in:
Gabriel Detraz 2017-09-06 15:06:31 +02:00 committed by root
parent 7fd52b2313
commit b40bc9708c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
search/views.py
View file

@ -80,29 +80,29 @@ def search_result(search, type, request):
if i == '0': if i == '0':
query_user_list = Q(room__name__icontains = search) | Q(pseudo__icontains = search) | Q(name__icontains = search) | Q(surname__icontains = search) & query1 query_user_list = Q(room__name__icontains = search) | Q(pseudo__icontains = search) | Q(name__icontains = search) | Q(surname__icontains = search) & query1
if request.user.has_perms(('cableur',)): if request.user.has_perms(('cableur',)):
recherche['users_list'] = User.objects.filter(query_user_list).order_by('state', 'surname') recherche['users_list'] = User.objects.filter(query_user_list).order_by('state', 'surname').distinct()
else : else :
recherche['users_list'] = User.objects.filter(query_user_list & Q(id=request.user.id)).order_by('state', 'surname') recherche['users_list'] = User.objects.filter(query_user_list & Q(id=request.user.id)).order_by('state', 'surname').distinct()
if i == '1': if i == '1':
query_machine_list = Q(machine__user__pseudo__icontains = search) | Q(machine__user__name__icontains = search) | Q(machine__user__surname__icontains = search) | Q(mac_address__icontains = search) | Q(ipv4__ipv4__icontains = search) | Q(domain__name__icontains = search) | Q(domain__related_domain__name__icontains = search) query_machine_list = Q(machine__user__pseudo__icontains = search) | Q(machine__user__name__icontains = search) | Q(machine__user__surname__icontains = search) | Q(mac_address__icontains = search) | Q(ipv4__ipv4__icontains = search) | Q(domain__name__icontains = search) | Q(domain__related_domain__name__icontains = search)
if request.user.has_perms(('cableur',)): if request.user.has_perms(('cableur',)):
data = Interface.objects.filter(query_machine_list) data = Interface.objects.filter(query_machine_list).distinct()
else: else:
data = Interface.objects.filter(query_machine_list & Q(machine__user__id = request.user.id)) data = Interface.objects.filter(query_machine_list & Q(machine__user__id = request.user.id)).distinct()
for d in data: for d in data:
recherche['machines_list'].append(d.machine) recherche['machines_list'].append(d.machine)
if i == '2': if i == '2':
recherche['facture_list'] = Facture.objects.filter(query & date_query) recherche['facture_list'] = Facture.objects.filter(query & date_query).distinct()
if i == '3': if i == '3':
recherche['ban_list'] = Ban.objects.filter(query) recherche['ban_list'] = Ban.objects.filter(query).distinct()
if i == '4': if i == '4':
recherche['white_list'] = Whitelist.objects.filter(query) recherche['white_list'] = Whitelist.objects.filter(query).distinct()
if i == '5': if i == '5':
recherche['port_list'] = Port.objects.filter(details__icontains = search) recherche['port_list'] = Port.objects.filter(details__icontains = search).distinct()
if not request.user.has_perms(('cableur',)): if not request.user.has_perms(('cableur',)):
recherche['port_list'] = None recherche['port_list'] = None
if i == '6': if i == '6':
recherche['switch_list'] = Switch.objects.filter(details__icontains = search) recherche['switch_list'] = Switch.objects.filter(details__icontains = search).distinct()
if not request.user.has_perms(('cableur',)): if not request.user.has_perms(('cableur',)):
recherche['switch_list'] = None recherche['switch_list'] = None
options, created = GeneralOption.objects.get_or_create() options, created = GeneralOption.objects.get_or_create()