yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-05 23:28:26 +02:00
Code Issues Releases Wiki Activity

Fixed unplayable playlists (bis repetita)

Browse source
This commit is contained in:
Eliot Berriot 2018-09-28 20:46:18 +02:00
parent 5e631440f8
commit 54972e489b
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
4 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
api/funkwhale_api/playlists/views.py
View file

@ -39,7 +39,9 @@ class PlaylistViewSet(
@detail_route(methods=["get"])
def tracks(self, request, *args, **kwargs):
playlist = self.get_object()
plts = playlist.playlist_tracks.all().for_nested_serialization()
plts = playlist.playlist_tracks.all().for_nested_serialization(
music_utils.get_actor_from_request(request)
)
serializer = serializers.PlaylistTrackSerializer(plts, many=True)
data = {"count": len(plts), "results": serializer.data}
return Response(data, status=200)
@ -59,7 +61,7 @@ class PlaylistViewSet(
plts = (
models.PlaylistTrack.objects.filter(pk__in=ids)
.order_by("index")
.for_nested_serialization()
.for_nested_serialization(music_utils.get_actor_from_request(request))
)
serializer = serializers.PlaylistTrackSerializer(plts, many=True)
data = {"count": len(plts), "results": serializer.data}
@ -97,7 +99,7 @@ class PlaylistTrackViewSet(
):
serializer_class = serializers.PlaylistTrackSerializer
queryset = models.PlaylistTrack.objects.all().for_nested_serialization()
queryset = models.PlaylistTrack.objects.all()
permission_classes = [
permissions.ConditionalAuthentication,
permissions.OwnerPermission,
@ -118,7 +120,7 @@ class PlaylistTrackViewSet(
lookup_field="playlist__privacy_level",
user_field="playlist__user",
)
).annotate_playable_by_actor(music_utils.get_actor_from_request(self.request))
).for_nested_serialization(music_utils.get_actor_from_request(self.request))
def perform_destroy(self, instance):
instance.delete(update_indexes=True)