From e14d1a6c154d20da2ea6d65b7dc0e51a93411f18 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 11 May 2017 18:24:43 +0200 Subject: [PATCH 1/3] Remove useless from parameter in mailers We already defined a default one in ApplicationMailer --- app/mailers/gestionnaire_mailer.rb | 3 +-- app/mailers/invite_mailer.rb | 3 +-- app/mailers/new_admin_mailer.rb | 2 +- app/mailers/notification_mailer.rb | 3 +-- app/mailers/welcome_mailer.rb | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/mailers/gestionnaire_mailer.rb b/app/mailers/gestionnaire_mailer.rb index 74765352b..8acbe7237 100644 --- a/app/mailers/gestionnaire_mailer.rb +++ b/app/mailers/gestionnaire_mailer.rb @@ -18,7 +18,6 @@ class GestionnaireMailer < ApplicationMailer def send_mail email, args, subject vars_mailer email, args - mail(from: "tps@apientreprise.fr", to: email, - subject: subject) + mail(to: email, subject: subject) end end diff --git a/app/mailers/invite_mailer.rb b/app/mailers/invite_mailer.rb index c536d9d46..09b58f229 100644 --- a/app/mailers/invite_mailer.rb +++ b/app/mailers/invite_mailer.rb @@ -19,8 +19,7 @@ class InviteMailer < ApplicationMailer end def send_mail email, subject, reply_to - mail(from: "tps@apientreprise.fr", - to: email, + mail(to: email, subject: subject, reply_to: reply_to) end diff --git a/app/mailers/new_admin_mailer.rb b/app/mailers/new_admin_mailer.rb index f7acb8e7e..6ec6e7092 100644 --- a/app/mailers/new_admin_mailer.rb +++ b/app/mailers/new_admin_mailer.rb @@ -4,7 +4,7 @@ class NewAdminMailer < ApplicationMailer @admin = admin @password = password - mail(from: "tps@apientreprise.fr", to: 'tech@apientreprise.fr', + mail(to: 'tech@apientreprise.fr', subject: "Création d'un compte Admin TPS") end end diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb index 1fa5265ea..7bca836bc 100644 --- a/app/mailers/notification_mailer.rb +++ b/app/mailers/notification_mailer.rb @@ -1,6 +1,5 @@ class NotificationMailer < ApplicationMailer - default from: 'tps@apientreprise.fr', - to: Proc.new { @user.email } + default to: Proc.new { @user.email } def send_notification dossier, mail_template vars_mailer(dossier) diff --git a/app/mailers/welcome_mailer.rb b/app/mailers/welcome_mailer.rb index b3542aecd..4306ee974 100644 --- a/app/mailers/welcome_mailer.rb +++ b/app/mailers/welcome_mailer.rb @@ -3,7 +3,7 @@ class WelcomeMailer < ApplicationMailer @user = user - mail(from: "tps@apientreprise.fr", to: user.email, + mail(to: user.email, subject: "Création de votre compte TPS") end end From 84ae1a0c0b9fa79f05121f92f06864a2746f4538 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 11 May 2017 14:32:32 +0200 Subject: [PATCH 2/3] Change the email address we send emails with Also add a display name, so that we don't show just a dumb email address --- app/mailers/application_mailer.rb | 2 +- config/initializers/devise.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 68533b7dd..243266f78 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,4 +1,4 @@ class ApplicationMailer < ActionMailer::Base - default from: "tps@apientreprise.fr" + default from: "'Téléprocédures Simplifiées' " layout 'mailer' end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 8d3886482..37cbd567a 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -10,7 +10,7 @@ Devise.setup do |config| # Configure the e-mail address which will be shown in Devise::Mailer, # note that it will be overwritten if you use your own mailer class # with default "from" parameter. - config.mailer_sender = 'tps@apientreprise.fr' + config.mailer_sender = "'Téléprocédures Simplifiées' " # Configure the class responsible to send e-mails. # config.mailer = 'Devise::Mailer' From 09ba66dc41cd3db9b8423e2fbc248f85cdcf866d Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 11 May 2017 14:29:59 +0200 Subject: [PATCH 3/3] [Fix #274] Change the email signatures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Equide -> Equipe - TPS -> Téléprocédures simplifiées - Remove the email address --- app/views/devise/mailer/reset_password_instructions.html.erb | 2 +- app/views/gestionnaire_mailer/new_assignement.text.erb | 2 +- app/views/gestionnaire_mailer/new_gestionnaire.text.erb | 2 +- app/views/invite_mailer/invite_guest.text.erb | 2 +- app/views/invite_mailer/invite_user.text.erb | 2 +- app/views/new_admin_mailer/new_admin_email.text.erb | 2 +- app/views/notification_mailer/new_answer.text.erb | 2 +- app/views/welcome_mailer/welcome_email.text.erb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb index 1cc3186e0..80466e643 100644 --- a/app/views/devise/mailer/reset_password_instructions.html.erb +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -12,4 +12,4 @@

---
- L'équipe TPS - tps@apientreprise.fr

\ No newline at end of file + L'équipe Téléprocédures Simplifiées

diff --git a/app/views/gestionnaire_mailer/new_assignement.text.erb b/app/views/gestionnaire_mailer/new_assignement.text.erb index 414086802..694f454b8 100644 --- a/app/views/gestionnaire_mailer/new_assignement.text.erb +++ b/app/views/gestionnaire_mailer/new_assignement.text.erb @@ -8,4 +8,4 @@ Vous venez d'être assigné à un administrateur sur la plateforme TPS. Voici qu Bonne journée, --- -L'équipe TPS - tps@apientreprise.fr \ No newline at end of file +L'équipe Téléprocédures Simplifiées diff --git a/app/views/gestionnaire_mailer/new_gestionnaire.text.erb b/app/views/gestionnaire_mailer/new_gestionnaire.text.erb index c68a7ae98..f7472cb9e 100644 --- a/app/views/gestionnaire_mailer/new_gestionnaire.text.erb +++ b/app/views/gestionnaire_mailer/new_gestionnaire.text.erb @@ -9,4 +9,4 @@ Vous venez d'être nommé accompagnateur sur la plateforme TPS. Pour mémoire, v Bonne journée, --- -L'équipe TPS - tps@apientreprise.fr \ No newline at end of file +L'équipe Téléprocédures Simplifiées diff --git a/app/views/invite_mailer/invite_guest.text.erb b/app/views/invite_mailer/invite_guest.text.erb index 1e5c87712..73894115d 100644 --- a/app/views/invite_mailer/invite_guest.text.erb +++ b/app/views/invite_mailer/invite_guest.text.erb @@ -9,4 +9,4 @@ Afin de répondre à cette invitation, merci de vous inscrit avec l'adresse emai Bonne journée. --- -L'équide TPS - tps@apientreprise.fr \ No newline at end of file +L'équipe Téléprocédures Simplifiées diff --git a/app/views/invite_mailer/invite_user.text.erb b/app/views/invite_mailer/invite_user.text.erb index 57827303c..53e98e30c 100644 --- a/app/views/invite_mailer/invite_user.text.erb +++ b/app/views/invite_mailer/invite_user.text.erb @@ -7,4 +7,4 @@ Pour le consulter, merci de suivre ce lien : <%= users_dossiers_invite_url(@invi Bonne journée. --- -L'équide TPS - tps@apientreprise.fr \ No newline at end of file +L'équipe Téléprocédures Simplifiées diff --git a/app/views/new_admin_mailer/new_admin_email.text.erb b/app/views/new_admin_mailer/new_admin_email.text.erb index 8b4d474df..547713f13 100644 --- a/app/views/new_admin_mailer/new_admin_email.text.erb +++ b/app/views/new_admin_mailer/new_admin_email.text.erb @@ -6,4 +6,4 @@ Login : <%= @admin.email %> Password : <%= @password %> --- -L'équipe TPS - tps@apientreprise.fr \ No newline at end of file +L'équipe Téléprocédures Simplifiées diff --git a/app/views/notification_mailer/new_answer.text.erb b/app/views/notification_mailer/new_answer.text.erb index d6874bd6d..039d306de 100644 --- a/app/views/notification_mailer/new_answer.text.erb +++ b/app/views/notification_mailer/new_answer.text.erb @@ -11,4 +11,4 @@ Merci de ne pas répondre à ce mail. Postez directement vos questions dans votr --- --- -L'équide TPS - tps@apientreprise.fr \ No newline at end of file +L'équipe Téléprocédures Simplifiées diff --git a/app/views/welcome_mailer/welcome_email.text.erb b/app/views/welcome_mailer/welcome_email.text.erb index 57984af05..90b547ce5 100644 --- a/app/views/welcome_mailer/welcome_email.text.erb +++ b/app/views/welcome_mailer/welcome_email.text.erb @@ -12,4 +12,4 @@ Oubli de mot de passe, pas de problème : Bonne journée, --- -L'équipe TPS - tps@apientreprise.fr \ No newline at end of file +L'équipe Téléprocédures Simplifiées