From b65a3d4bafc3e45fe8f3c3aa25d7e0b61b748f8f Mon Sep 17 00:00:00 2001 From: Lisa Durand Date: Thu, 5 Jan 2023 12:03:22 +0100 Subject: [PATCH] puts filters in span to display correctly multiples filters --- .../procedures/_dossiers_filter.html.haml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/instructeurs/procedures/_dossiers_filter.html.haml b/app/views/instructeurs/procedures/_dossiers_filter.html.haml index 0d6455f81..3c35be6a1 100644 --- a/app/views/instructeurs/procedures/_dossiers_filter.html.haml +++ b/app/views/instructeurs/procedures/_dossiers_filter.html.haml @@ -4,12 +4,12 @@ #filter-menu.dropdown-content.left-aligned.fade-in-down{ data: { menu_button_target: 'menu' } } = render Dossiers::FilterComponent.new(procedure: procedure, procedure_presentation: @procedure_presentation, statut: statut) -- current_filters.group_by { |filter| filter['table'] }.each_with_index do |(table, filters), i| - - if i > 0 - = " et " - - filters.each_with_index do |filter, i| + - current_filters.group_by { |filter| filter['table'] }.each_with_index do |(table, filters), i| - if i > 0 - = " ou " - = link_to remove_filter_instructeur_procedure_path(procedure, { statut: statut, field: "#{filter['table']}/#{filter['column']}", value: filter['value'] }), - class: "fr-tag fr-tag--dismiss fr-mb-1w", aria: { label: "Retirer le filtre #{filter['column']}" } do - = "#{filter['label'].truncate(50)} : #{procedure_presentation.human_value_for_filter(filter)}" + = " et " + - filters.each_with_index do |filter, i| + - if i > 0 + = " ou " + = link_to remove_filter_instructeur_procedure_path(procedure, { statut: statut, field: "#{filter['table']}/#{filter['column']}", value: filter['value'] }), + class: "fr-tag fr-tag--dismiss fr-mb-1w", aria: { label: "Retirer le filtre #{filter['column']}" } do + = "#{filter['label'].truncate(50)} : #{procedure_presentation.human_value_for_filter(filter)}"