sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fix

Browse Source
This commit is contained in:
Sander Roosendaal
2020-12-31 06:30:24 +01:00
parent 0b3312d033
commit 11cec956b7
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rowers/views/analysisviews.py
View File

@@ -209,13 +209,16 @@ def analysis_new(request,userid=0,function='boxplot',teamid=0,id=''):
query = request.POST.get('q') query = request.POST.get('q')
if query: if query:
query_list = query.split() query_list = query.split()
workouts = workouts.filter( try:
reduce(operator.and_, workouts = workouts.filter(
(Q(name__icontains=q) for q in query_list)) | reduce(operator.and_,
reduce(operator.and_, (Q(name__icontains=q) for q in query_list)) |
reduce(operator.and_,
(Q(notes__icontains=q) for q in query_list)) (Q(notes__icontains=q) for q in query_list))
) )
searchform = SearchForm(initial={'q':query}) searchform = SearchForm(initial={'q':query})
except TypeError:
searchform = SearchForm()
else: else:
searchform = SearchForm() searchform = SearchForm()