From 5c0ed712cf861aeff27866e6fd86ddf33858e929 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Sun, 5 Apr 2026 23:24:13 +0900 Subject: [PATCH] Two more Turbo opt-ins similar to ea120a43fda1d6cf2154b7e124f64d8e690f8426 --- app/views/profiles/merge.html.haml | 2 +- app/views/staff/speaker_email_templates/edit.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/profiles/merge.html.haml b/app/views/profiles/merge.html.haml index 17d56defe..f62e83122 100644 --- a/app/views/profiles/merge.html.haml +++ b/app/views/profiles/merge.html.haml @@ -36,4 +36,4 @@ .mt-4.d-flex.justify-content-between = link_to 'Cancel', edit_profile_path, class: 'btn btn-secondary' - = button_to 'Merge Accounts', merge_profile_path, class: 'btn btn-primary', data: {turbo_confirm: 'Are you sure you want to merge these accounts? This cannot be undone.'} + = button_to 'Merge Accounts', merge_profile_path, class: 'btn btn-primary', form: {data: {turbo: true}}, data: {turbo_confirm: 'Are you sure you want to merge these accounts? This cannot be undone.'} diff --git a/app/views/staff/speaker_email_templates/edit.html.haml b/app/views/staff/speaker_email_templates/edit.html.haml index e753aa185..0b307517a 100644 --- a/app/views/staff/speaker_email_templates/edit.html.haml +++ b/app/views/staff/speaker_email_templates/edit.html.haml @@ -5,7 +5,7 @@ .form-group.template-actions %button.btn.btn-sm.btn-success{type: 'submit'} Save = link_to "Remove", event_staff_speaker_email_template_path(@event, @type_key), class: "btn btn-sm btn-danger", - data: {turbo_method: :delete, turbo_confirm: 'This template will be erased and the default template will be used instead. Proceed?'} + data: {turbo: true, turbo_method: :delete, turbo_confirm: 'This template will be erased and the default template will be used instead. Proceed?'} = link_to "Cancel", event_staff_speaker_email_template_path(@event, @type_key), class: "btn btn-sm btn-gray" .form-group = f.text_area @type_key, class: 'form-control', rows: 20, placeholder: "Please enter some text", value: @text, autofocus: true