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

Merge branch '422-musicbrainz-button-no-mbid' into 'develop' 

Fix #422: Do not display "view on MusicBrainz" button if we miss the mbid

Closes #422

See merge request funkwhale/funkwhale!450
This commit is contained in:
Eliot Berriot 2018-10-20 14:28:34 +00:00
parent a30136d26d 10fff6ea67
commit 1bf8838aa7
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Do not display "view on MusicBrainz" button if we miss the mbid (#422)

6
front/src/components/library/Album.vue
View File

@ -33,7 +33,7 @@
<i class="wikipedia icon"></i>
<translate>Search on Wikipedia</translate>
</a>
<a :href="musicbrainzUrl" target="_blank" class="ui button">
<a v-if="musicbrainzUrl" :href="musicbrainzUrl" target="_blank" class="ui button">
<i class="external icon"></i>
<translate>View on MusicBrainz</translate>
</a>
@ -105,7 +105,9 @@ export default {
return 'https://en.wikipedia.org/w/index.php?search=' + encodeURI(this.album.title + ' ' + this.album.artist.name)
},
musicbrainzUrl () {
return 'https://musicbrainz.org/release/' + this.album.mbid
if (this.album.mbid) {
return 'https://musicbrainz.org/release/' + this.album.mbid
}
},
headerStyle () {
if (!this.album.cover.original) {

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

@ -31,7 +31,7 @@
<i class="wikipedia icon"></i>
<translate>Search on Wikipedia</translate>
</a>
<a :href="musicbrainzUrl" target="_blank" class="ui button">
<a v-if="musicbrainzUrl" :href="musicbrainzUrl" target="_blank" class="ui button">
<i class="external icon"></i>
<translate>View on MusicBrainz</translate>
</a>
@ -154,7 +154,9 @@ export default {
return 'https://en.wikipedia.org/w/index.php?search=' + encodeURI(this.artist.name)
},
musicbrainzUrl () {
return 'https://musicbrainz.org/artist/' + this.artist.mbid
if (this.artist.mbid) {
return 'https://musicbrainz.org/artist/' + this.artist.mbid
}
},
allTracks () {
let tracks = []

6
front/src/components/library/Track.vue
View File

@ -40,7 +40,7 @@
<i class="wikipedia icon"></i>
<translate>Search on Wikipedia</translate>
</a>
<a :href="musicbrainzUrl" target="_blank" class="ui button">
<a v-if="musicbrainzUrl" :href="musicbrainzUrl" target="_blank" class="ui button">
<i class="external icon"></i>
<translate>View on MusicBrainz</translate>
</a>
@ -199,7 +199,9 @@ export default {
return 'https://en.wikipedia.org/w/index.php?search=' + encodeURI(this.track.title + ' ' + this.track.artist.name)
},
musicbrainzUrl () {
return 'https://musicbrainz.org/recording/' + this.track.mbid
if (this.track.mbid) {
return 'https://musicbrainz.org/recording/' + this.track.mbid
}
},
downloadUrl () {
let u = this.$store.getters['instance/absoluteUrl'](this.track.listen_url)