Merge branch 'dev'

This commit is contained in:
gregoirenovel 2018-07-04 18:14:15 +02:00
commit fcfdbaac2d

View file

@ -23,7 +23,7 @@
- if tpjs.present? - if tpjs.present?
.card.featured .card.featured
.card-title .card-title
Pièces-jointes Pièces jointes
- tpjs.each do |tpj| - tpjs.each do |tpj|
.pj-input .pj-input
@ -42,7 +42,7 @@
- if dossier.was_piece_justificative_uploaded_for_type_id?(tpj.id) - if dossier.was_piece_justificative_uploaded_for_type_id?(tpj.id)
- pj = dossier.retrieve_last_piece_justificative_by_type(tpj.id) - pj = dossier.retrieve_last_piece_justificative_by_type(tpj.id)
%p %p
Pièce-jointe déjà importée : Pièce jointe déjà importée :
= link_to pj.original_filename, pj.content_url, target: :blank = link_to pj.original_filename, pj.content_url, target: :blank
= file_field_tag "piece_justificative_#{tpj.id}", = file_field_tag "piece_justificative_#{tpj.id}",