diff --git a/umbraaudio/web/templates/speakers.html b/umbraaudio/web/templates/speakers.html index 8257aa3..fe93f65 100644 --- a/umbraaudio/web/templates/speakers.html +++ b/umbraaudio/web/templates/speakers.html @@ -120,10 +120,10 @@ function notify(message, isError) { // later row pointing at the wrong speaker. function deleteSpeaker(idx, name) { if (!confirm('Delete ' + name + '?')) return; - requestDelete(idx, ''); + requestDelete(idx, '', name); } -function requestDelete(idx, reassignTo) { +function requestDelete(idx, reassignTo, name) { var url = '/api/speakers/' + idx + (reassignTo ? '?reassign_to=' + encodeURIComponent(reassignTo) : ''); fetch(url, {method: 'DELETE', headers: {'HX-Request': 'true'}}) @@ -133,7 +133,7 @@ function requestDelete(idx, reassignTo) { }) .then(function (res) { if (res.status === 409) { - showReassignPrompt(idx, nameOf(res.data), res.data); + showReassignPrompt(idx, name, res.data); return; } if (res.status !== 200) { @@ -143,7 +143,7 @@ function requestDelete(idx, reassignTo) { htmx.ajax('GET', '/speakers/partial', { target: '#speakers-list', swap: 'innerHTML' }); - var msg = 'Deleted ' + nameOf(res.data) + '.'; + notify('Deleted ' + name + '.'); notify(msg); initSpeakerNames(); }) @@ -152,10 +152,6 @@ function requestDelete(idx, reassignTo) { }); } -function nameOf(data) { - return (data && data.speaker_name) || 'speaker'; -} - function showReassignPrompt(idx, name, data) { var box = document.getElementById('delete-prompt-' + idx); if (!box) { @@ -175,7 +171,7 @@ function showReassignPrompt(idx, name, data) { '