DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8410 from tchak/refactor-procedures-all

Browse source 
refactor(demarches): use turbo-frame
This commit is contained in:
Paul Chavard 2023-01-12 11:55:06 +01:00 committed by GitHub
commit 247bd6128e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/administrateurs/procedures/administrateurs.html.haml
View file

@ -1,6 +1,6 @@
- content_for :results do - content_for :results do
.main-filter-header.fr-my-3w .main-filter-header.fr-my-3w
= form_with(url: administrateurs_admin_procedures_path, method: :get, html: {'data-autosubmit-target': 'form', role: 'search' }) do |f| = form_with(url: administrateurs_admin_procedures_path, method: :get, html: { 'data-autosubmit-target': 'form', 'data-turbo-frame': 'procedures', role: 'search' }) do |f|
- @filter.zone_ids&.each do |zone_id| - @filter.zone_ids&.each do |zone_id|
= hidden_field_tag 'zone_ids[]', zone_id = hidden_field_tag 'zone_ids[]', zone_id
- @filter.statuses&.each do |status| - @filter.statuses&.each do |status|

2
app/views/administrateurs/procedures/all.html.haml
View file

@ -1,6 +1,6 @@
- content_for :results do - content_for :results do
.main-filter-header.fr-my-3w .main-filter-header.fr-my-3w
= form_with(url: all_admin_procedures_path, method: :get, html: { 'data-autosubmit-target': 'form', role: 'search', class: 'search' }) do |f| = form_with(url: all_admin_procedures_path, method: :get, html: { 'data-autosubmit-target': 'form', 'data-turbo-frame': 'procedures', role: 'search', class: 'search' }) do |f|
- @filter.zone_ids&.each do |zone_id| - @filter.zone_ids&.each do |zone_id|
= hidden_field_tag 'zone_ids[]', zone_id = hidden_field_tag 'zone_ids[]', zone_id
- @filter.statuses&.each do |status| - @filter.statuses&.each do |status|

4
app/views/layouts/all.html.haml
View file

@ -12,7 +12,7 @@
.fr-container--fluid{ 'data-turbo': 'true', 'data-controller': 'autosubmit' } .fr-container--fluid{ 'data-turbo': 'true', 'data-controller': 'autosubmit' }
.fr-grid-row.fr-grid-row--gutters .fr-grid-row.fr-grid-row--gutters
.fr-col-3 .fr-col-3
= form_with(url: all_admin_procedures_path, method: :get, html: {'data-autosubmit-target': 'form'}) do |f| = form_with(url: all_admin_procedures_path, method: :get, html: { 'data-autosubmit-target': 'form', 'data-turbo-frame': 'procedures' }) do |f|
%fieldset.sidebar-filter %fieldset.sidebar-filter
%legend %legend
@ -64,6 +64,6 @@
= b.check_box(checked: @filter.status_filtered?(b.value), 'data-action': 'autosubmit#submit') = b.check_box(checked: @filter.status_filtered?(b.value), 'data-action': 'autosubmit#submit')
= b.label(class: 'fr-label') { t b.text, scope: 'activerecord.attributes.procedure.aasm_state' } = b.label(class: 'fr-label') { t b.text, scope: 'activerecord.attributes.procedure.aasm_state' }
.fr-col-9 %turbo-frame#procedures.fr-col-9{ 'data-turbo-action': 'advance' }
= yield(:results) = yield(:results)
= render template: 'layouts/application' = render template: 'layouts/application'