From 5dd330301917e2e61d984e87438f7e3ccd3752fa Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Thu, 2 Jan 2025 19:20:08 +0100 Subject: [PATCH] Disable Turbo in User forms/links --- app/helpers/application_helper.rb | 2 +- app/views/layouts/application.html.erb | 2 +- app/views/users/registrations/edit.html.erb | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7ecf4c7..39e3c38 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -51,7 +51,7 @@ module ApplicationHelper end def labelled_form_for(record, options = {}, &block) - options.merge! builder: LabelledFormBuilder + options = options.deep_merge builder: LabelledFormBuilder, data: {turbo: false} form_for(record, **options) { |f| f.form_for(&block) } end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 382254c..b5c2257 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -34,7 +34,7 @@ <%= image_link_to t(".revert"), "incognito-off", revert_users_path %> <% else %> <%= image_button_to t(".sign_out"), "logout", destroy_user_session_path, - method: :delete %> + method: :delete, data: {turbo: false} %> <% end %> <% else %> <%= image_link_to_unless_current(t(:sign_in), "login", new_user_session_path) {} %> diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb index 28c323e..e0527a8 100644 --- a/app/views/users/registrations/edit.html.erb +++ b/app/views/users/registrations/edit.html.erb @@ -5,7 +5,8 @@
<%= image_button_to t(".delete"), "account-remove-outline", user_registration_path, - method: :delete, form_class: 'tools', onclick: {confirm: t(".confirm_delete")} %> + form_class: 'tools', method: :delete, data: {turbo: false}, + onclick: {confirm: t(".confirm_delete")} %>
<%= labelled_form_for resource, url: registration_path(resource),