technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-10 11:32:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge both search-fields into one

Browse Source
This commit is contained in:
Olaf Slomp
2019-10-31 10:32:07 +01:00
committed by Daan Sprenkels
parent 581e14f7ef
commit 4c9a431f8a
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
marietje/api/views.py
View File

@ -95,8 +95,7 @@ def songs(request):
def search_songs():
queries = [Q(deleted=False)]
queries.extend([Q(Q(artist__icontains=word) | Q(title__icontains=word)) for word in request.POST.get('all', '').split()])
queries.extend([Q(user__name__icontains=word) for word in request.POST.get('uploader', '').split()])
queries.extend([Q(Q(artist__icontains=word) | Q(title__icontains=word) | Q(user__name__icontains=word)) for word in request.POST.get('all', '').split()])
filter_query = queries.pop()
for query in queries: