From 1533db727726cdfb0d0dc87c199fc314e51837b8 Mon Sep 17 00:00:00 2001 From: fauno Date: Thu, 11 Jul 2024 19:48:50 +0000 Subject: [PATCH 1/2] ci: assets [skip ci] --- .../.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json b/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json index a02bc597..2f6448b9 100644 --- a/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json +++ b/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3490e9162dac35602a9fca74cf56b37b5914ace3050979ae121241aa4c8b35dd +oid sha256:ca096f4d66ff4cc80dfa4b99a79da73f80f7d883c3807fd0fb2f936b20d7cfd9 size 11449 From 6b6077f3cc751e4baa24d9d7694545d961e4fc9c Mon Sep 17 00:00:00 2001 From: f Date: Thu, 11 Jul 2024 19:19:05 -0300 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20avisar=20que=20se=20va=20a=20recarga?= =?UTF-8?q?r=20la=20p=C3=A1gina=20cuando=20hay=20cambios=20en=20modales?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/posts/_htmx_form.haml | 4 ++-- app/views/posts/modal.haml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/posts/_htmx_form.haml b/app/views/posts/_htmx_form.haml index 75967a40..1c3cc783 100644 --- a/app/views/posts/_htmx_form.haml +++ b/app/views/posts/_htmx_form.haml @@ -30,8 +30,8 @@ 'hx-target': "##{pluck_param(:target)}", 'hx-validate': true, data: { - controller: 'form-validation', - action: 'form-validation#submit', + controller: 'unsaved-changes form-validation', + action: 'unsaved-changes#submit form-validation#submit beforeunload@window->unsaved-changes#unsaved turbolinks:before-visit@window->unsaved-changes#unsavedTurbolinks', 'form-validation-submitting-id-value': pluck_param(:submitting, optional: true), 'form-validation-invalid-id-value': pluck_param(:invalid, optional: true), } diff --git a/app/views/posts/modal.haml b/app/views/posts/modal.haml index 2174595c..14836118 100644 --- a/app/views/posts/modal.haml +++ b/app/views/posts/modal.haml @@ -31,6 +31,12 @@ options[:class] += ' edit' end + data = {} + data[:controller] = 'unsaved-changes form-validation' + data[:action] = 'unsaved-changes#submit form-validation#submit beforeunload@window->unsaved-changes#unsaved turbolinks:before-visit@window->unsaved-changes#unsavedTurbolinks' + + options[:data] = data + %div{ id: modal_id, data: { controller: 'modal' }} = render 'bootstrap/modal', id: modal_id, modal_content_attributes: { class: 'h-100' } do - content_for :"#{modal_id}_body" do