rend accessible la personnalisation des filtres instructeurs
en remplaçant select2 par ComboMultipleDropdownList
This commit is contained in:
parent
c855d13994
commit
3fc7b57b8c
3 changed files with 7 additions and 9 deletions
|
@ -138,7 +138,7 @@ module Instructeurs
|
||||||
end
|
end
|
||||||
|
|
||||||
def update_displayed_fields
|
def update_displayed_fields
|
||||||
procedure_presentation.update_displayed_fields(params[:values])
|
procedure_presentation.update_displayed_fields(JSON.parse(params[:values]))
|
||||||
|
|
||||||
redirect_back(fallback_location: instructeur_procedure_url(procedure))
|
redirect_back(fallback_location: instructeur_procedure_url(procedure))
|
||||||
end
|
end
|
||||||
|
|
|
@ -122,10 +122,10 @@
|
||||||
Personnaliser
|
Personnaliser
|
||||||
#custom-menu.dropdown-content.fade-in-down
|
#custom-menu.dropdown-content.fade-in-down
|
||||||
= form_tag update_displayed_fields_instructeur_procedure_path(@procedure), method: :patch, class: 'dropdown-form columns-form' do
|
= form_tag update_displayed_fields_instructeur_procedure_path(@procedure), method: :patch, class: 'dropdown-form columns-form' do
|
||||||
= select_tag :values,
|
- hidden_field_id = SecureRandom.uuid
|
||||||
options_for_select(@displayed_fields_options, selected: @displayed_fields_selected),
|
= hidden_field_tag :values, nil, data: { uuid: hidden_field_id }
|
||||||
multiple: true,
|
= react_component("ComboMultipleDropdownList", options: @displayed_fields_options, selected: @displayed_fields_selected, disabled: [], hiddenFieldId: hidden_field_id, label: 'colonne')
|
||||||
class: 'select2-limited'
|
|
||||||
= submit_tag "Enregistrer", class: 'button'
|
= submit_tag "Enregistrer", class: 'button'
|
||||||
|
|
||||||
%tbody
|
%tbody
|
||||||
|
|
|
@ -125,15 +125,13 @@ feature "procedure filters" do
|
||||||
|
|
||||||
def add_column(column_name)
|
def add_column(column_name)
|
||||||
click_on 'Personnaliser'
|
click_on 'Personnaliser'
|
||||||
find("span.select2-container").click
|
select_multi('colonne', column_name)
|
||||||
find(:xpath, "//li[text()='#{column_name}']").click
|
|
||||||
click_button "Enregistrer"
|
click_button "Enregistrer"
|
||||||
end
|
end
|
||||||
|
|
||||||
def remove_column(column_name)
|
def remove_column(column_name)
|
||||||
click_on 'Personnaliser'
|
click_on 'Personnaliser'
|
||||||
find(:xpath, "//li[contains(@title, '#{column_name}')]/span[contains(text(), '×')]").click
|
find(:xpath, "//li[contains(text(), '#{column_name}')]/span[contains(text(), 'x')]").click
|
||||||
find(:xpath, "//form[contains(@class, 'columns-form')]//span[contains(@class, 'select2-container')]").click
|
|
||||||
click_button "Enregistrer"
|
click_button "Enregistrer"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue