diff --git a/app/components/instructeurs/column_filter_value_component.rb b/app/components/instructeurs/column_filter_value_component.rb index abd4c10a9..cc1d15485 100644 --- a/app/components/instructeurs/column_filter_value_component.rb +++ b/app/components/instructeurs/column_filter_value_component.rb @@ -54,10 +54,6 @@ class Instructeurs::ColumnFilterValueComponent < ApplicationComponent [_1.label, _1.id] end end - elsif column.table == 'dossier_labels' - Procedure.find(procedure_id).labels.filter_map do - [_1.name, _1.id] - end else column.options_for_select end diff --git a/app/models/concerns/columns_concern.rb b/app/models/concerns/columns_concern.rb index e01173412..6a269c21e 100644 --- a/app/models/concerns/columns_concern.rb +++ b/app/models/concerns/columns_concern.rb @@ -91,7 +91,7 @@ module ColumnsConcern def user_france_connected_column = Columns::DossierColumn.new(procedure_id: id, table: 'self', column: 'user_from_france_connect?', filterable: false, displayable: false) - def dossier_labels_column = Columns::DossierColumn.new(procedure_id: id, table: 'dossier_labels', column: 'label_id', type: :enum) + def dossier_labels_column = Columns::DossierColumn.new(procedure_id: id, table: 'dossier_labels', column: 'label_id', type: :enum, options_for_select: labels.map { [_1.name, _1.id] }) def procedure_chorus_columns ['domaine_fonctionnel', 'referentiel_prog', 'centre_de_cout']