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

Fixed empty results issue when browsing library with playable filter

Browse source
This commit is contained in:
Eliot Berriot 2020-03-24 10:31:07 +01:00
parent 2440550591
commit e4b989f51a
No known key found for this signature in database
GPG key ID: 6B501DFD73514E14
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,8 @@ class LibraryFilterSet(filters.FilterSet):
uploads = models.Upload.objects.filter(library=library)
uploads = uploads.playable_by(actor)
ids = uploads.values_list(self.Meta.library_filter_field, flat=True)
return queryset.filter(pk__in=ids)
qs = queryset.filter(pk__in=ids).distinct()
return qs
class ArtistFilter(
@ -88,7 +89,7 @@ class ArtistFilter(
def filter_playable(self, queryset, name, value):
actor = utils.get_actor_from_request(self.request)
return queryset.playable_by(actor, value)
return queryset.playable_by(actor, value).distinct()
class TrackFilter(
@ -127,7 +128,7 @@ class TrackFilter(
def filter_playable(self, queryset, name, value):
actor = utils.get_actor_from_request(self.request)
return queryset.playable_by(actor, value)
return queryset.playable_by(actor, value).distinct()
class UploadFilter(audio_filters.IncludeChannelsFilterSet):