Merge branch '795-album-cover' into 'develop'

Fix#795: cover not showing in queue/player when playing tracks from "albums" tab

Closes #795

See merge request funkwhale/funkwhale!710
merge-requests/757/head
Eliot Berriot 2019-04-08 11:43:04 +02:00
commit 8eb0022842
2 zmienionych plików z 16 dodań i 1 usunięć

Wyświetl plik

@ -0,0 +1 @@
Fixed cover not showing in queue/player when playing tracks from "albums" tab (#795)

Wyświetl plik

@ -45,7 +45,7 @@
</div>
</div>
<div class="extra content">
<play-button class="mini basic orange right floated" :tracks="album.tracks" :album="album">
<play-button class="mini basic orange right floated" :tracks="tracksWithAlbum" :album="album">
<translate translate-context="Content/Queue/Button.Label/Short, Verb">Play all</translate>
</play-button>
<span>
@ -83,6 +83,20 @@ export default {
return this.album.tracks
}
return this.album.tracks.slice(0, this.initialTracks)
},
tracksWithAlbum () {
// needed to include album data (especially cover)
// with tracks appended in queue (#795)
let self = this
return this.album.tracks.map(t => {
return {
...t,
album: {
...self.album,
tracks: []
}
}
})
}
}
}