Merge branch 'dsprenkels/remove_executed' of ssh://gitlab.science.ru.nl/dsprenkels/MarietjeDjango into dsprenkels/remove_executed

This commit is contained in:
Daan Sprenkels
2019-03-20 11:20:09 +01:00

View File

@ -15,7 +15,7 @@ from .decorators import token_required
@token_required
def queue(request):
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({
'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]],