technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2026-02-04 09:24:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/now-really-fix-error-message-reporting' into 'marietje-zuid'

Browse Source 
fix(queues): now really fix the request notifications

Closes #82

See merge request technicie/MarietjeDjango!91
This commit is contained in:
Kees van Kempen
2024-03-05 13:25:13 +01:00
parent beda2a4c63 669e1e3b18
commit 841e5daf8f
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
marietje/queues/api/v1/views.py
View File

@ -163,7 +163,7 @@ class QueueRequestAPIView(CreateAPIView):
try: try:
playlist_song = queue.request(song, request.user) playlist_song = queue.request(song, request.user)
except RequestException as e: except RequestException as e:
return Response(data={"success": False, "errorMessage": str(e)}) return Response(status=403, data={"success": False, "errorMessage": str(e)})
request_counter.labels(queue=queue.name).inc() request_counter.labels(queue=queue.name).inc()
return Response(status=200, data=self.serializer_class(playlist_song).data) return Response(status=200, data=self.serializer_class(playlist_song).data)

4
marietje/queues/templates/queues/queue.html
View File

@ -594,8 +594,7 @@
"Content-Type": 'application/json', "Content-Type": 'application/json',
}, },
}).then(response => { }).then(response => {
// TODO: Communicate failure through HTTP error codes (403) instead of checking response.success. if (response.status === 200) {
if (response.status === 200 && response.success) {
return response.json(); return response.json();
} else { } else {
throw response; throw response;
@ -612,7 +611,6 @@
tata.error('', "An unknown exception occurred.") tata.error('', "An unknown exception occurred.")
} }
}); });
queue_vue.refresh();
}, },
report_song(song_id) { report_song(song_id) {