diff --git a/CHANGELOG.md b/CHANGELOG.md index 1876a2c..f9931c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ## 2.15.3 - 2026-10-15 +### Fixed + +- Preserved the force-delete flag when submitting a screen with onboarding-device bindings. + ### Changed - Replaced the canvas-size duplicate action with reversible disable/enable controls. Disabled sizes remain assigned to existing templates and playlists but cannot be selected for new ones. diff --git a/src/web/public/js/admin/admin-page.js b/src/web/public/js/admin/admin-page.js index 8c9497b..d0ce39f 100644 --- a/src/web/public/js/admin/admin-page.js +++ b/src/web/public/js/admin/admin-page.js @@ -22,6 +22,10 @@ return; } + if (form.hasAttribute('data-native-submit')) { + return; + } + var actionPath = ''; try { actionPath = new URL(form.action, window.location.href).pathname; diff --git a/src/web/views/signage/screens/form.hbs b/src/web/views/signage/screens/form.hbs index 574edae..d1d16a9 100644 --- a/src/web/views/signage/screens/form.hbs +++ b/src/web/views/signage/screens/form.hbs @@ -43,7 +43,7 @@ {{#if screen.canForceDelete}} -
+
{{/if}} diff --git a/test/web-screens-routes.test.js b/test/web-screens-routes.test.js index 4a4d483..259e6d5 100644 --- a/test/web-screens-routes.test.js +++ b/test/web-screens-routes.test.js @@ -269,6 +269,7 @@ test('screen edit page offers force delete for disconnected onboarding bindings' assert.match(html, /Force delete/); assert.match(html, /name="force_delete" value="1"/); + assert.match(html, /data-native-submit/); assert.match(html, /Force delete this screen group and unlink its onboarding devices\?/); assert.ok(html.indexOf('form="screen-force-delete-form"') < html.indexOf('class="btn-group save-action-group"')); assert.match(html, /class="ms-auto">\s*