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

use champ_column.stable_id

Browse source
This commit is contained in:
simon lehericey 2024-10-31 18:35:20 +01:00
parent 74e6834ce2
commit 8507733250
No known key found for this signature in database
GPG key ID: CDE670D827C7B3C5
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/components/instructeurs/column_filter_value_component.rb
View file

@ -54,12 +54,11 @@ class Instructeurs::ColumnFilterValueComponent < ApplicationComponent
end end
end end
else else
find_type_de_champ(column.column).options_for_select(column) find_type_de_champ(column.stable_id).options_for_select(column)
end end
end end
def find_type_de_champ(column) def find_type_de_champ(stable_id)
stable_id = column.to_s.split('->').first
TypeDeChamp TypeDeChamp
.joins(:revision_types_de_champ) .joins(:revision_types_de_champ)
.where(revision_types_de_champ: { revision_id: ProcedureRevision.where(procedure_id:) }) .where(revision_types_de_champ: { revision_id: ProcedureRevision.where(procedure_id:) })

6
app/components/instructeurs/filter_buttons_component.rb
View file

@ -49,7 +49,7 @@ class Instructeurs::FilterButtonsComponent < ApplicationComponent
column, filter = filter_column.column, filter_column.filter column, filter = filter_column.column, filter_column.filter
if column.type_de_champ? if column.type_de_champ?
find_type_de_champ(column.column).dynamic_type.filter_to_human(filter) find_type_de_champ(column.stable_id).dynamic_type.filter_to_human(filter)
elsif column.dossier_state? elsif column.dossier_state?
if filter == 'pending_correction' if filter == 'pending_correction'
Dossier.human_attribute_name("pending_correction.for_instructeur") Dossier.human_attribute_name("pending_correction.for_instructeur")
@ -66,9 +66,7 @@ class Instructeurs::FilterButtonsComponent < ApplicationComponent
end end
end end
def find_type_de_champ(column) def find_type_de_champ(stable_id)
stable_id = column.to_s.split('->').first
TypeDeChamp TypeDeChamp
.joins(:revision_types_de_champ) .joins(:revision_types_de_champ)
.where(revision_types_de_champ: { revision_id: @procedure_presentation.procedure.revisions }) .where(revision_types_de_champ: { revision_id: @procedure_presentation.procedure.revisions })