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

Tweak filtering for users and clubs in search to better handle user-defined filters

Browse source
This commit is contained in:
Jean-Romain Garnier 2019-12-06 13:24:09 +00:00 committed by root
parent 33001cc734
commit 51f65340d8
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
search/views.py
View file

@ -112,17 +112,22 @@ def search_single_word(word, filters, user, start, end, user_state, aff):
# Users # Users
if "0" in aff: if "0" in aff:
filter_users = ( filter_clubs = (
Q(surname__icontains=word) Q(surname__icontains=word)
| Q(pseudo__icontains=word) | Q(pseudo__icontains=word)
| Q(room__name__icontains=word) | Q(room__name__icontains=word)
| Q(email__icontains=word) | Q(email__icontains=word)
| Q(telephone__icontains=word) | Q(telephone__icontains=word)
) & Q(state__in=user_state) )
filter_users = (filter_clubs | Q(name__icontains=word))
if not User.can_view_all(user)[0]: if not User.can_view_all(user)[0]:
filter_clubs &= Q(id=user.id)
filter_users &= Q(id=user.id) filter_users &= Q(id=user.id)
filter_clubs = filter_users
filter_users |= Q(name__icontains=word) filter_clubs &= Q(state__in=user_state)
filter_users &= Q(state__in=user_state)
filters["users"] |= filter_users filters["users"] |= filter_users
filters["clubs"] |= filter_clubs filters["clubs"] |= filter_clubs