Merge branch '1096-wrong-album-count' into 'master'

Fix #1096: Fixed wrong album and track count in admin artist API

See merge request funkwhale/funkwhale!1108
This commit is contained in:
Agate 2020-05-04 12:18:48 +02:00
commit 3382d8d8b3
2 changed files with 3 additions and 2 deletions

View File

@ -84,8 +84,8 @@ class ManageArtistViewSet(
music_models.Artist.objects.all()
.order_by("-id")
.select_related("attributed_to", "attachment_cover", "channel")
.annotate(_tracks_count=Count("tracks"))
.annotate(_albums_count=Count("albums"))
.annotate(_tracks_count=Count("tracks", distinct=True))
.annotate(_albums_count=Count("albums", distinct=True))
.prefetch_related(music_views.TAG_PREFETCH)
)
serializer_class = serializers.ManageArtistSerializer

View File

@ -0,0 +1 @@
Fixed wrong album and track count in admin artist API (#1096)