From a46d75601becb112f32007f9230f22432cc81b22 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Thu, 27 Feb 2020 17:41:27 +0100 Subject: [PATCH] suite --- app/mailers/general_mails.rb | 3 ++- app/views/admin/m_odrs/_form.html.haml | 3 +++ app/views/layouts/mail.html.haml | 5 ++++- app/views/public/m_odr_reps/thank.html.haml | 4 +++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/mailers/general_mails.rb b/app/mailers/general_mails.rb index 99d5619..e7cd8f9 100644 --- a/app/mailers/general_mails.rb +++ b/app/mailers/general_mails.rb @@ -8,11 +8,12 @@ class GeneralMails < ActionMailer::Base def general(lang_slug, mail_type, email, options = {}) + @options = options @m_odr = @options[:m_odr] @m_odr_rep = @options[:m_odr_rep] - @options = options + @mail_type = mail_type diff --git a/app/views/admin/m_odrs/_form.html.haml b/app/views/admin/m_odrs/_form.html.haml index c4a7154..0462bc0 100644 --- a/app/views/admin/m_odrs/_form.html.haml +++ b/app/views/admin/m_odrs/_form.html.haml @@ -118,6 +118,9 @@ .qi_row .qi_pannel.qi_plain.padding + + = f.input :email_from, :label => "Email d'envoi :" + Mails types : %hr diff --git a/app/views/layouts/mail.html.haml b/app/views/layouts/mail.html.haml index 404e2ef..a15d8af 100755 --- a/app/views/layouts/mail.html.haml +++ b/app/views/layouts/mail.html.haml @@ -34,7 +34,10 @@ #odr_form - .form_pannel= yield + .form_pannel + = yield + %br + %br -if @m_odr diff --git a/app/views/public/m_odr_reps/thank.html.haml b/app/views/public/m_odr_reps/thank.html.haml index c5983ba..7ee6c5c 100644 --- a/app/views/public/m_odr_reps/thank.html.haml +++ b/app/views/public/m_odr_reps/thank.html.haml @@ -15,7 +15,9 @@ -else %p Merci pour votre participation - + + %br + %br -if false =@m_odr_rep.token %br