Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Philipp Wolfer
funkwhale
Commits
071ff89a
Commit
071ff89a
authored
May 19, 2021
by
Ciarán Ainsworth
Committed by
Georg Krause
May 19, 2021
Browse files
Fix recently listened widget and simple artist serializer
parent
0c8f4400
Changes
2
Hide whitespace changes
Inline
Side-by-side
api/funkwhale_api/history/views.py
View file @
071ff89a
...
...
@@ -56,7 +56,9 @@ class ListeningViewSet(
)
tracks
=
Track
.
objects
.
with_playable_uploads
(
music_utils
.
get_actor_from_request
(
self
.
request
)
).
select_related
(
"artist"
,
"album__artist"
,
"attributed_to"
)
).
select_related
(
"artist"
,
"album__artist"
,
"attributed_to"
,
"artist__attachment_cover"
)
return
queryset
.
prefetch_related
(
Prefetch
(
"track"
,
queryset
=
tracks
))
def
get_serializer_context
(
self
):
...
...
front/src/components/audio/track/Widget.vue
View file @
071ff89a
...
...
@@ -8,6 +8,8 @@
<div
:class=
"['item', itemClasses]"
v-for=
"object in objects"
:key=
"object.id"
>
<div
class=
"ui tiny image"
>
<img
alt=
""
v-if=
"object.track.album && object.track.album.cover"
v-lazy=
"$store.getters['instance/absoluteUrl'](object.track.album.cover.urls.medium_square_crop)"
>
<img
alt=
""
v-else-if=
"object.track.cover"
v-lazy=
"$store.getters['instance/absoluteUrl'](object.track.cover.urls.medium_square_crop)"
/>
<img
alt=
""
v-else-if=
"object.track.artist.cover"
v-lazy=
"$store.getters['instance/absoluteUrl'](object.track.artist.cover.urls.medium_square_crop)"
/>
<img
alt=
""
v-else
src=
"../../../assets/audio/default-cover.png"
>
<play-button
class=
"play-overlay"
:icon-only=
"true"
:button-classes=
"['ui', 'circular', 'tiny', 'vibrant', 'icon', 'button']"
:track=
"object.track"
></play-button>
</div>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment