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

Merge branch 'fix_search' into 'master'

Browse source 
Fix search

See merge request nounous/re2o!15
This commit is contained in:
Gabriel Detraz 2018-03-27 04:26:41 +02:00
commit 06d4b42716
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
search/views.py
View file

@ -260,7 +260,7 @@ def search_single_word(word, filters, user,
) | Q( ) | Q(
machine_interface__domain__name__icontains=word machine_interface__domain__name__icontains=word
) | Q( ) | Q(
related__switch__domain__name__icontains=word related__switch__interface__domain__name__icontains=word
) | Q( ) | Q(
radius__icontains=word radius__icontains=word
) | Q( ) | Q(
@ -277,9 +277,9 @@ def search_single_word(word, filters, user,
# Switches # Switches
if '7' in aff and Switch.can_view_all(user): if '7' in aff and Switch.can_view_all(user):
filter_switches = Q( filter_switches = Q(
domain__name__icontains=word interface__domain__name__icontains=word
) | Q( ) | Q(
ipv4__ipv4__icontains=word interface__ipv4__ipv4__icontains=word
) | Q( ) | Q(
location__icontains=word location__icontains=word
) | Q( ) | Q(
@ -289,7 +289,7 @@ def search_single_word(word, filters, user,
) | Q( ) | Q(
model__constructor__name__icontains=word model__constructor__name__icontains=word
) | Q( ) | Q(
details__icontains=word interface__details__icontains=word
) )
if is_int(word): if is_int(word):
filter_switches |= Q( filter_switches |= Q(