MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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

See merge request funkwhale/funkwhale!809
This commit is contained in:
Eliot Berriot 2019-07-01 09:37:23 +02:00
parent 0524c6db97 18f0ed46a7
commit 1404f18cb9
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/871.bugfix Normal file
View File

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

2
front/src/components/library/AlbumBase.vue
View File

@ -192,7 +192,7 @@ export default {
subtitle () { subtitle () {
let route = this.$router.resolve({name: 'library.artists.detail', params: {id: this.object.artist.id }}) 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) 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: { watch: {

4
front/src/components/library/TrackBase.vue
View File

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