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

[#3477] Extract helper to find field

Browse source
This commit is contained in:
Frederic Merizen 2019-02-13 18:24:41 +01:00
parent bda41d7574
commit 822a3f7098
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/new_gestionnaire/procedures_controller.rb
View file

@ -102,11 +102,7 @@ module NewGestionnaire
end end
fields = values.map do |value| fields = values.map do |value|
table, column = value.split("/") find_field(*value.split('/'))
procedure_presentation.fields.find do |field|
field['table'] == table && field['column'] == column
end
end end
procedure_presentation.update(displayed_fields: fields) procedure_presentation.update(displayed_fields: fields)
@ -145,7 +141,7 @@ module NewGestionnaire
if params[:value].present? if params[:value].present?
filters = procedure_presentation.filters filters = procedure_presentation.filters
table, column = params[:field].split('/') table, column = params[:field].split('/')
label = procedure_presentation.fields.find { |c| c['table'] == table && c['column'] == column }['label'] label = find_field(table, column)['label']
filters[statut] << { filters[statut] << {
'label' => label, 'label' => label,
@ -194,6 +190,10 @@ module NewGestionnaire
private private
def find_field(table, column)
procedure_presentation.fields.find { |c| c['table'] == table && c['column'] == column }
end
def field_id(field) def field_id(field)
field.values_at('table', 'column').join('/') field.values_at('table', 'column').join('/')
end end