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

[#2750] Move fields_for_select to ProcedurePresentation

Browse source
This commit is contained in:
Frederic Merizen 2018-10-03 14:46:12 +02:00
parent b6b4a76906
commit efcac5192a
6 changed files with 35 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/new_gestionnaire/procedures/show.html.haml
View file

@ -73,7 +73,7 @@
= render partial: "header_field", locals: { field: { "label" => "Nº dossier", "table" => "self", "column" => "id" }, classname: "number-col" }
- @displayed_fields.each do |field|
- @procedure_presentation.displayed_fields.each do |field|
= render partial: "header_field", locals: { field: field, classname: "" }
= render partial: "header_field", locals: { field: { "label" => "Statut", "table" => "self", "column" => "state" }, classname: "status-col" }
@ -85,7 +85,7 @@
.dropdown-content.fade-in-down
= form_tag update_displayed_fields_gestionnaire_procedure_path(@procedure), method: :patch, class: 'dropdown-form columns-form' do
= select_tag :values,
options_for_select(@procedure.fields_for_select,
options_for_select(@procedure_presentation.fields_for_select,
selected: @displayed_fields_values),
multiple: true,
class: 'select2-limited'
@ -105,7 +105,7 @@
= link_to(gestionnaire_dossier_path(@procedure, dossier), class: 'cell-link') do
= dossier.id
- @displayed_fields.each do |field|
- @procedure_presentation.displayed_fields.each do |field|
%td
= link_to(gestionnaire_dossier_path(@procedure, dossier), class: 'cell-link') do
= dossier_field_service.get_value(dossier, field['table'], field['column'])