Merge branch 'develop' into staging

This commit is contained in:
Mathieu Magnin 2017-02-17 17:18:36 +01:00
commit 5b22a34cff

View file

@ -37,7 +37,7 @@ class MailTemplate < ActiveRecord::Base
when :numero_dossier when :numero_dossier
dossier.id.to_s dossier.id.to_s
when :lien_dossier when :lien_dossier
URL # quickfix TPS::Application::URL # quickfix
# link_to users_dossier_recapitulatif_url(dossier), users_dossier_recapitulatif_url(dossier), target: '_blank' # link_to users_dossier_recapitulatif_url(dossier), users_dossier_recapitulatif_url(dossier), target: '_blank'
when :libelle_procedure when :libelle_procedure
dossier.procedure.libelle dossier.procedure.libelle