Merge branch '581-0-tracks-library' into 'develop'

Fixed #581: missing track count on various library cards

Closes #581

See merge request funkwhale/funkwhale!455
This commit is contained in:
Eliot Berriot 2018-10-21 15:44:08 +00:00
commit c96d182dd7
3 changed files with 2 additions and 1 deletions

View File

@ -35,7 +35,7 @@ def get_libraries(filter_uploads):
uploads = uploads.playable_by(actor)
libraries = models.Library.objects.filter(
pk__in=uploads.values_list("library", flat=True)
)
).annotate(_uploads_count=Count("uploads"))
libraries = libraries.select_related("actor")
page = self.paginate_queryset(libraries)
if page is not None:

View File

@ -462,6 +462,7 @@ def test_can_get_libraries_for_music_entities(
import_status="finished", library__privacy_level="me", track=upload.track
).library
library = upload.library
setattr(library, "_uploads_count", 1)
data = {
"artist": upload.track.artist,
"album": upload.track.album,

View File