mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-09-10 16:23:09 +00:00
Reparation des recherches pour les nons cableurs
This commit is contained in:
parent
809d13d987
commit
1600615153
1 changed files with 19 additions and 12 deletions
|
@ -49,13 +49,25 @@ def search_result(search, type, request):
|
||||||
|
|
||||||
recherche = {'users_list': None, 'machines_list' : [], 'facture_list' : None, 'ban_list' : None, 'white_list': None, 'port_list': None, 'switch_list': None}
|
recherche = {'users_list': None, 'machines_list' : [], 'facture_list' : None, 'ban_list' : None, 'white_list': None, 'port_list': None, 'switch_list': None}
|
||||||
|
|
||||||
|
if request.user.has_perms(('cableur',)):
|
||||||
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)
|
||||||
|
else:
|
||||||
|
query = (Q(user__pseudo__icontains = search) | Q(user__name__icontains = search) | Q(user__surname__icontains = search)) & Q(user = request.user)
|
||||||
|
|
||||||
|
|
||||||
for i in aff:
|
for i in aff:
|
||||||
if i == '0':
|
if i == '0':
|
||||||
recherche['users_list'] = User.objects.filter((Q(room__name__icontains = search) | Q(pseudo__icontains = search) | Q(name__icontains = search) | Q(surname__icontains = search)) & query1).order_by('state', 'surname')
|
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',)):
|
||||||
|
recherche['users_list'] = User.objects.filter(query_user_list).order_by('state', 'surname')
|
||||||
|
else :
|
||||||
|
recherche['users_list'] = User.objects.filter(query_user_list & Q(id=request.user.id)).order_by('state', 'surname')
|
||||||
if i == '1':
|
if i == '1':
|
||||||
data = Interface.objects.filter(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',)):
|
||||||
|
data = Interface.objects.filter(query_machine_list)
|
||||||
|
else:
|
||||||
|
data = Interface.objects.filter(query_machine_list & Q(machine__user__id = request.user.id))
|
||||||
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':
|
||||||
|
@ -66,17 +78,12 @@ def search_result(search, type, request):
|
||||||
recherche['white_list'] = Whitelist.objects.filter(query)
|
recherche['white_list'] = Whitelist.objects.filter(query)
|
||||||
if i == '5':
|
if i == '5':
|
||||||
recherche['port_list'] = Port.objects.filter(details__icontains = search)
|
recherche['port_list'] = Port.objects.filter(details__icontains = search)
|
||||||
|
if not request.user.has_perms(('cableur',)):
|
||||||
|
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)
|
||||||
|
|
||||||
if not request.user.has_perms(('cableur',)):
|
if not request.user.has_perms(('cableur',)):
|
||||||
for r in recherche:
|
recherche['switch_list'] = None
|
||||||
if r == 'users_list':
|
|
||||||
recherche[r] = recherche[r].filter(id=request.user.id)
|
|
||||||
elif r in ('switch_list','port_list'):
|
|
||||||
recherche[r] = None
|
|
||||||
elif recherche[r]:
|
|
||||||
recherche[r] = recherche[r].filter(user = request.user)
|
|
||||||
|
|
||||||
for r in recherche:
|
for r in recherche:
|
||||||
if recherche[r] != None:
|
if recherche[r] != None:
|
||||||
|
|
Loading…
Reference in a new issue