Skip to content
Snippets Groups Projects
Commit 82034f11 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch '201-escape-track-name' into 'develop'

Resolve "tiny encoding issue for track name"

Closes #201

See merge request funkwhale/funkwhale!193
parents 8d2529f4 8a321d4a
No related branches found
No related tags found
No related merge requests found
......@@ -361,7 +361,7 @@ class Track(APIModelMixin):
import_tags
]
objects = TrackQuerySet.as_manager()
tags = TaggableManager()
tags = TaggableManager(blank=True)
class Meta:
ordering = ['album', 'position']
......
Fixed escaping issue of track name in playlist modal (#201)
......@@ -7,9 +7,7 @@
<div class="description">
<template v-if="track">
<h4 class="ui header">{{ $t('Current track') }}</h4>
<div>
{{ $t('"{%title%}" by {%artist%}', { title: track.title, artist: track.artist.name }) }}
</div>
<div v-html='trackDisplay'></div>
<div class="ui divider"></div>
</template>
......@@ -112,6 +110,12 @@ export default {
let p = _.sortBy(this.playlists, [(e) => { return e.modification_date }])
p.reverse()
return p
},
trackDisplay () {
return this.$t('"{%title%}" by {%artist%}', {
title: this.track.title,
artist: this.track.artist.name }
)
}
},
watch: {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment