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

Merge branch 'dsprenkels/remove_executed' into 'marietje-zuid'

Browse Source 
Remove executed field from QueueCommand
This change was already added. But accidentally pushed to marietje-zuid. This commit fixes that buggy change.

See merge request dsprenkels/MarietjeDjango!29
This commit is contained in:
Daan Sprenkels
2019-03-20 11:22:57 +01:00
parent 9b559cb3f2 fc60135d6c
commit dff15663f4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
marietje/playerapi/views.py
View File

@ -15,7 +15,7 @@ from .decorators import token_required
@token_required @token_required
def queue(request): def queue(request):
current_queue = get_object_or_404(Queue, id=request.POST.get('queue')) current_queue = get_object_or_404(Queue, id=request.POST.get('queue'))
commands = current_queue.queuecommand_set commands = current_queue.queuecommand_set.all()
response = JsonResponse({ response = JsonResponse({
'current_song': playlist_song_to_dict(current_queue.current_song(), include_hash=True, include_replaygain=True), 'current_song': playlist_song_to_dict(current_queue.current_song(), include_hash=True, include_replaygain=True),
'queue': [playlist_song_to_dict(playlist_song, include_hash=True, include_replaygain=True) for playlist_song in current_queue.queue()[:1]], 'queue': [playlist_song_to_dict(playlist_song, include_hash=True, include_replaygain=True) for playlist_song in current_queue.queue()[:1]],