Merge branch '201-escape-track-name' into 'develop'
Resolve "tiny encoding issue for track name" Closes #201 See merge request funkwhale/funkwhale!193
This commit is contained in:
commit
82034f118d
|
@ -361,7 +361,7 @@ class Track(APIModelMixin):
|
||||||
import_tags
|
import_tags
|
||||||
]
|
]
|
||||||
objects = TrackQuerySet.as_manager()
|
objects = TrackQuerySet.as_manager()
|
||||||
tags = TaggableManager()
|
tags = TaggableManager(blank=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
ordering = ['album', 'position']
|
ordering = ['album', 'position']
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Fixed escaping issue of track name in playlist modal (#201)
|
|
@ -7,9 +7,7 @@
|
||||||
<div class="description">
|
<div class="description">
|
||||||
<template v-if="track">
|
<template v-if="track">
|
||||||
<h4 class="ui header">{{ $t('Current track') }}</h4>
|
<h4 class="ui header">{{ $t('Current track') }}</h4>
|
||||||
<div>
|
<div v-html='trackDisplay'></div>
|
||||||
{{ $t('"{%title%}" by {%artist%}', { title: track.title, artist: track.artist.name }) }}
|
|
||||||
</div>
|
|
||||||
<div class="ui divider"></div>
|
<div class="ui divider"></div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -112,6 +110,12 @@ export default {
|
||||||
let p = _.sortBy(this.playlists, [(e) => { return e.modification_date }])
|
let p = _.sortBy(this.playlists, [(e) => { return e.modification_date }])
|
||||||
p.reverse()
|
p.reverse()
|
||||||
return p
|
return p
|
||||||
|
},
|
||||||
|
trackDisplay () {
|
||||||
|
return this.$t('"{%title%}" by {%artist%}', {
|
||||||
|
title: this.track.title,
|
||||||
|
artist: this.track.artist.name }
|
||||||
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
|
Loading…
Reference in New Issue