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

Fix force adding already existing track to the playlist (#1802)

This commit is contained in:
wvffle 2022-07-17 11:14:54 +00:00 committed by Georg Krause
parent a545333ff7
commit 1c770ff5c2
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/components/playlists/Form.vue
View File

@ -94,6 +94,8 @@ const submit = async () => {
isLoading.value = false isLoading.value = false
} }
</script> </script>
<template> <template>

29
front/src/components/playlists/PlaylistModal.vue
View File

@ -40,8 +40,8 @@ const sortedPlaylists = computed(() => flow(
const formKey = ref(new Date().toString()) const formKey = ref(new Date().toString())
watch(() => store.state.playlists.showModal, () => { watch(() => store.state.playlists.showModal, () => {
formKey.value = new Date().toString() formKey.value = new Date().toString()
showDuplicateTrackAddConfirmation.value = false showDuplicateTrackAddConfirmation.value = false
}) })
const lastSelectedPlaylist = ref(-1) const lastSelectedPlaylist = ref(-1)
@ -64,9 +64,7 @@ const addToPlaylist = async (playlistId: number, allowDuplicates: boolean) => {
if (error as BackendError) { if (error as BackendError) {
const { backendErrors, rawPayload = {} } = error as BackendError const { backendErrors, rawPayload = {} } = error as BackendError
// TODO (wvffle): Test if it works if (backendErrors.length === 1 && backendErrors[0] === 'Tracks Already Exist In Playlist') {
// if (backendErrors.length === 1 && backendErrors[0].code === 'tracks_already_exist_in_playlist') {
if (backendErrors.length === 1 && backendErrors[0] === 'Tracks already exist in playlist') {
duplicateTrackAddInfo.value = ((rawPayload.playlist as APIErrorResponse).non_field_errors as APIErrorResponse)[0] as object duplicateTrackAddInfo.value = ((rawPayload.playlist as APIErrorResponse).non_field_errors as APIErrorResponse)[0] as object
showDuplicateTrackAddConfirmation.value = true showDuplicateTrackAddConfirmation.value = true
} else { } else {
@ -76,6 +74,8 @@ const addToPlaylist = async (playlistId: number, allowDuplicates: boolean) => {
} }
} }
} }
store.dispatch('playlists/fetchOwn')
</script> </script>
<template> <template>
@ -249,16 +249,17 @@ const addToPlaylist = async (playlistId: number, allowDuplicates: boolean) => {
</div> </div>
</template> </template>
</div> </div>
<template v-else> <div
<div class="ui placeholder segment"> v-else
<div class="ui icon header"> class="ui placeholder segment"
<i class="list icon" /> >
<translate translate-context="Content/Home/Placeholder"> <div class="ui icon header">
No playlists have been created yet <i class="list icon" />
</translate> <translate translate-context="Content/Home/Placeholder">
</div> No playlists have been created yet
</translate>
</div> </div>
</template> </div>
</div> </div>
<div class="actions"> <div class="actions">
<button class="ui basic cancel button"> <button class="ui basic cancel button">