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

Resolve "Track position don't take care about disc number"

Browse source
This commit is contained in:
Eliot Berriot 2018-12-06 08:53:31 +00:00
parent 16aef2e597
commit a493d34b8f
14 changed files with 82 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
api/funkwhale_api/music/serializers.py
View file

@ -88,6 +88,7 @@ class AlbumTrackSerializer(serializers.ModelSerializer):
"artist",
"creation_date",
"position",
"disc_number",
"uploads",
"listen_url",
"duration",
@ -130,10 +131,7 @@ class AlbumSerializer(serializers.ModelSerializer):
)
def get_tracks(self, o):
ordered_tracks = sorted(
o.tracks.all(),
key=lambda v: (v.position, v.title) if v.position else (99999, v.title),
)
ordered_tracks = o.tracks.all()
return AlbumTrackSerializer(ordered_tracks, many=True).data
def get_is_playable(self, obj):
@ -193,6 +191,7 @@ class TrackSerializer(serializers.ModelSerializer):
"artist",
"creation_date",
"position",
"disc_number",
"lyrics",
"uploads",
"listen_url",