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

Merge branch '457-artist-no-tracks' into 'develop' 

Resolve "Artist showing up while not existing"

Closes #457

See merge request funkwhale/funkwhale!360
This commit is contained in:
Eliot Berriot 2018-07-27 17:09:11 +00:00
parent 75852e537a c53f03c4a5
commit b17ab1eb3a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Fixed crash on artist pages when no cover is available (#457)

8
front/src/components/library/Artist.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div v-title="labels.title">
<div v-if="isLoading" class="ui vertical segment" v-title="labels.title"> <div v-if="isLoading" class="ui vertical segment">
<div :class="['ui', 'centered', 'active', 'inline', 'loader']"></div> <div :class="['ui', 'centered', 'active', 'inline', 'loader']"></div>
</div> </div>
<template v-if="artist"> <template v-if="artist">
@ -102,7 +102,7 @@ export default {
self.artist = response.data self.artist = response.data
self.isLoading = false self.isLoading = false
self.isLoadingAlbums = true self.isLoadingAlbums = true
axios.get('albums/', {params: {artist: this.id, ordering: '-release_date'}}).then((response) => { axios.get('albums/', {params: {artist: self.id, ordering: '-release_date'}}).then((response) => {
let parsed = JSON.parse(JSON.stringify(response.data.results)) let parsed = JSON.parse(JSON.stringify(response.data.results))
self.albums = parsed.map((album) => { self.albums = parsed.map((album) => {
return backend.Album.clean(album) return backend.Album.clean(album)
@ -158,7 +158,7 @@ export default {
})[0] })[0]
}, },
headerStyle () { headerStyle () {
if (!this.cover.original) { if (!this.cover || !this.cover.original) {
return '' return ''
} }
return 'background-image: url(' + this.$store.getters['instance/absoluteUrl'](this.cover.original) + ')' return 'background-image: url(' + this.$store.getters['instance/absoluteUrl'](this.cover.original) + ')'