MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed empty results issue when browsing library with playable filter

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
Show Stats 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 = 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(
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(
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):

2
front/src/views/library/DetailBase.vue
View File

@ -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>