rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-01 07:34:37 +00:00
Code Issues Releases Wiki Activity

Add plaintext representation for Query

Browse source
This commit is contained in:
Jean-Romain Garnier 2020-02-18 14:01:48 +00:00 committed by Supelec Rezo Rennes
parent e36a7c7f1f
commit 66183f9288
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
search/views.py
View file

@ -69,6 +69,13 @@ class Query:
self.subqueries.append(Query(self.text)) self.subqueries.append(Query(self.text))
self.text = "" self.text = ""
@property
def plaintext(self):
if self.operator is not None:
return self.operator.join([q.plaintext for q in self.subqueries])
return self.text
def is_int(variable): def is_int(variable):
""" Check if the variable can be casted to an integer """ """ Check if the variable can be casted to an integer """
@ -236,9 +243,8 @@ def search_single_word(word, filters, user, start, end, user_state, aff):
# Rooms # Rooms
if "5" in aff and Room.can_view_all(user): if "5" in aff and Room.can_view_all(user):
filter_rooms = ( filter_rooms = (
Q(details__icontains=word) | Q(name__icontains=word) | Q(port__details=word) | Q(building__name__icontains=building) Q(details__icontains=word) | Q(name__icontains=word) | Q(port__details=word) | Q(building__name__icontains=word)
) )
filter_rooms |= (Q(name__icontains=room) & Q(building__name__icontains=building))
filters["rooms"] |= filter_rooms filters["rooms"] |= filter_rooms