Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
funkwhale
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arthur Brugière
funkwhale
Commits
071ff89a
Commit
071ff89a
authored
4 years ago
by
Ciarán Ainsworth
Committed by
Georg Krause
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix recently listened widget and simple artist serializer
parent
0c8f4400
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
api/funkwhale_api/history/views.py
+3
-1
3 additions, 1 deletion
api/funkwhale_api/history/views.py
front/src/components/audio/track/Widget.vue
+2
-0
2 additions, 0 deletions
front/src/components/audio/track/Widget.vue
with
5 additions
and
1 deletion
api/funkwhale_api/history/views.py
+
3
−
1
View file @
071ff89a
...
@@ -56,7 +56,9 @@ class ListeningViewSet(
...
@@ -56,7 +56,9 @@ class ListeningViewSet(
)
)
tracks
=
Track
.
objects
.
with_playable_uploads
(
tracks
=
Track
.
objects
.
with_playable_uploads
(
music_utils
.
get_actor_from_request
(
self
.
request
)
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
))
return
queryset
.
prefetch_related
(
Prefetch
(
"
track
"
,
queryset
=
tracks
))
def
get_serializer_context
(
self
):
def
get_serializer_context
(
self
):
...
...
This diff is collapsed.
Click to expand it.
front/src/components/audio/track/Widget.vue
+
2
−
0
View file @
071ff89a
...
@@ -8,6 +8,8 @@
...
@@ -8,6 +8,8 @@
<div
:class=
"['item', itemClasses]"
v-for=
"object in objects"
:key=
"object.id"
>
<div
:class=
"['item', itemClasses]"
v-for=
"object in objects"
:key=
"object.id"
>
<div
class=
"ui tiny image"
>
<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-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"
>
<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>
<play-button
class=
"play-overlay"
:icon-only=
"true"
:button-classes=
"['ui', 'circular', 'tiny', 'vibrant', 'icon', 'button']"
:track=
"object.track"
></play-button>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment