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

Revert "Merge branch 'oslomp/search_field' into 'marietje-zuid'"

Browse Source 
This reverts merge request !42
This commit is contained in:
Daan Sprenkels
2019-11-01 17:31:44 +01:00
parent 7af7127612
commit a3f501273f
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
marietje/api/views.py
View File

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