Merge branch 'dev'

This commit is contained in:
gregoirenovel 2017-12-15 18:37:28 +01:00
commit 6e4ea935f7
2 changed files with 3 additions and 3 deletions

View file

@ -1,6 +1,6 @@
.editable-champ
- if is_not_header_nor_explication?(champ)
= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
= render partial: 'new_gestionnaire/dossiers/editable_champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
= render partial: "new_gestionnaire/dossiers/champs/#{champ.type_champ}",
= render partial: "new_gestionnaire/dossiers/editable_champs/#{champ.type_champ}",
locals: { champ: champ, form: form }

View file

@ -23,7 +23,7 @@
= form_for @dossier, url: '', html: { class: 'form' } do |f|
= f.fields_for :champs do |champ_form|
- champ = champ_form.object
= render partial: "new_gestionnaire/dossiers/champs/champ",
= render partial: "new_gestionnaire/dossiers/editable_champs/editable_champ",
locals: { champ: champ, form: champ_form, seen_at: nil }
%input{ type: "password", value: "12345678" }