From af5b6dafe9b222919e2ab88435a9af8eb8b0d65d Mon Sep 17 00:00:00 2001 From: John Naegle Date: Fri, 30 Nov 2018 11:29:48 -0500 Subject: [PATCH 1/2] Remove data-disable-with attributes on the page update form --- app/views/comfy/admin/cms/pages/_form.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/comfy/admin/cms/pages/_form.html.haml b/app/views/comfy/admin/cms/pages/_form.html.haml index 113d629ef..595e7ee96 100644 --- a/app/views/comfy/admin/cms/pages/_form.html.haml +++ b/app/views/comfy/admin/cms/pages/_form.html.haml @@ -26,6 +26,6 @@ = comfy_admin_partial "comfy/admin/cms/partials/page_form_after", form: form = form.form_actions do - = submit_tag t(".preview"), name: "preview", formtarget: "comfy-cms-preview", id: nil, class: "btn btn-secondary", data: {disable_with: false} - = submit_tag t(@page.new_record?? ".create" : ".update"), class: "btn btn-primary ml-sm-1", data: {disable_with: false} + = submit_tag t(".preview"), name: "preview", formtarget: "comfy-cms-preview", id: nil, class: "btn btn-secondary" + = submit_tag t(@page.new_record?? ".create" : ".update"), class: "btn btn-primary ml-sm-1" = link_to t(".cancel"), comfy_admin_cms_site_pages_path, class: "btn btn-link" From 9caf30116935ac7274d913c9b9bf7e00e9872f11 Mon Sep 17 00:00:00 2001 From: rob mathews Date: Wed, 4 Aug 2021 14:12:05 -0400 Subject: [PATCH 2/2] update this route which was failing in ruby 3.0 --- lib/comfortable_mexican_sofa/routing.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/comfortable_mexican_sofa/routing.rb b/lib/comfortable_mexican_sofa/routing.rb index 56cd62466..2f700693a 100644 --- a/lib/comfortable_mexican_sofa/routing.rb +++ b/lib/comfortable_mexican_sofa/routing.rb @@ -6,7 +6,7 @@ class ActionDispatch::Routing::Mapper def comfy_route(identifier, options = {}) - send("comfy_route_#{identifier}", options) + send("comfy_route_#{identifier}", **options) end end