Merge branch '871-artist-url' into 'master'

Resolve "Broken link to artist page in album and track header"

See merge request funkwhale/funkwhale!809
environments/review-front-brok-oyrjvg/deployments/2100
Eliot Berriot 2019-07-01 09:37:23 +02:00
commit 1404f18cb9
3 zmienionych plików z 4 dodań i 3 usunięć

Wyświetl plik

@ -0,0 +1 @@
Fixed broken URL to artist and album on album and track pages (#871)

Wyświetl plik

@ -192,7 +192,7 @@ export default {
subtitle () {
let route = this.$router.resolve({name: 'library.artists.detail', params: {id: this.object.artist.id }})
let msg = this.$npgettext('Content/Album/Header.Title', 'Album containing %{ count } track, by <a class="internal" href="%{ artistUrl }">%{ artist }</a>', 'Album containing %{ count } tracks, by <a class="internal" href="%{ artistUrl }">%{ artist }</a>', this.object.tracks.length)
return this.$gettextInterpolate(msg, {count: this.object.tracks.length, artist: this.object.artist.name, artistUrl: route.location.path})
return this.$gettextInterpolate(msg, {count: this.object.tracks.length, artist: this.object.artist.name, artistUrl: route.href})
}
},
watch: {

Wyświetl plik

@ -210,11 +210,11 @@ export default {
},
albumUrl () {
let route = this.$router.resolve({name: 'library.albums.detail', params: {id: this.track.album.id }})
return route.location.path
return route.href
},
artistUrl () {
let route = this.$router.resolve({name: 'library.artists.detail', params: {id: this.track.artist.id }})
return route.location.path
return route.href
},
headerStyle() {
if (!this.cover) {