Skip to content
Snippets Groups Projects
Verified Commit e4b989f5 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Fixed empty results issue when browsing library with playable filter

parent 24405505
No related branches found
No related tags found
No related merge requests found
...@@ -58,7 +58,8 @@ class LibraryFilterSet(filters.FilterSet): ...@@ -58,7 +58,8 @@ class LibraryFilterSet(filters.FilterSet):
uploads = models.Upload.objects.filter(library=library) uploads = models.Upload.objects.filter(library=library)
uploads = uploads.playable_by(actor) uploads = uploads.playable_by(actor)
ids = uploads.values_list(self.Meta.library_filter_field, flat=True) 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( class ArtistFilter(
...@@ -88,7 +89,7 @@ class ArtistFilter( ...@@ -88,7 +89,7 @@ class ArtistFilter(
def filter_playable(self, queryset, name, value): def filter_playable(self, queryset, name, value):
actor = utils.get_actor_from_request(self.request) actor = utils.get_actor_from_request(self.request)
return queryset.playable_by(actor, value) return queryset.playable_by(actor, value).distinct()
class TrackFilter( class TrackFilter(
...@@ -127,7 +128,7 @@ class TrackFilter( ...@@ -127,7 +128,7 @@ class TrackFilter(
def filter_playable(self, queryset, name, value): def filter_playable(self, queryset, name, value):
actor = utils.get_actor_from_request(self.request) 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): class UploadFilter(audio_filters.IncludeChannelsFilterSet):
......
...@@ -105,13 +105,11 @@ ...@@ -105,13 +105,11 @@
</router-link> </router-link>
</div> </div>
<div class="ui hidden divider"></div> <div class="ui hidden divider"></div>
<keep-alive>
<router-view <router-view
@updated="fetchData" @updated="fetchData"
@uploads-finished="object.uploads_count += $event" @uploads-finished="object.uploads_count += $event"
:is-owner="isOwner" :is-owner="isOwner"
:object="object"></router-view> :object="object"></router-view>
</keep-alive>
</div> </div>
</div> </div>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment