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

Merge branch 'fix/timezone' into 'master'

Browse Source 
Fix timezone issues.

See merge request !9
This commit is contained in:
Jim Driessen
2017-06-12 17:13:55 +02:00
parent 2a96b5eaf2 be3b7b6a0a
commit e8aeb271b9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
marietje/api/views.py
View File

@ -159,7 +159,7 @@ def queue(request):
return JsonResponse({
'current_song': playlist_song_to_dict(queue.current_song()),
'queue': [playlist_song_to_dict(playlist_song, user=request.user) for playlist_song in queue.queue()],
'started_at': 0 if queue.started_at is None else int(time.mktime(queue.started_at.timetuple())),
'started_at': 0 if queue.started_at is None else int(queue.started_at.timestamp()),
'current_time': int(time.time())
})

4
marietje/playerapi/views.py
View File

@ -1,4 +1,4 @@
from datetime import datetime
from django.utils import timezone
from django.http import JsonResponse
from django.shortcuts import get_object_or_404
@ -31,7 +31,7 @@ def queue(request):
@token_required
def play(request):
queue = get_object_or_404(Queue, id=request.POST.get('queue'))
queue.started_at = datetime.now()
queue.started_at = timezone.now()
queue.save()
return JsonResponse({})