Merge branch 'release/0.11.10.7'

ulmic · Jan 5, 2017 · a51fe52 · a51fe52
2 parents 27b4c3d + 35a7ada
commit a51fe52
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/app/mailers/news_mailer.rb b/app/mailers/news_mailer.rb
@@ -4,6 +4,6 @@ class NewsMailer < ApplicationMailer
   def create(news, user)
     @user = user
     @news = news
-    mail from: sender_name, to: user.corporate_email.present? ? user.corporate_email : user.email, subject: subject(news.class, :create)
+    mail from: sender_name, to: user.notificable_email, subject: subject(news.class, :create)
   end
 end
diff --git a/lib/notifications/types/email.rb b/lib/notifications/types/email.rb
@@ -2,23 +2,24 @@ module Notifications
   module Types
     class Email
       def self.to_send(params)
+        decorated_user = params[:user].decorate
         case params[:object].class.name
         when 'News'
-          NewsMailer.delay.send(params[:theme], params[:object], params[:user])
+          NewsMailer.delay.send(params[:theme], params[:object], decorated_user)
         when 'Questionary'
           if QuestionaryMailer.respond_to? params[:theme]
-            QuestionaryMailer.delay.send(params[:theme], params[:object], params[:user])
+            QuestionaryMailer.delay.send(params[:theme], params[:object], decorated_user)
           else
-            UserMailer.delay.send(params[:theme], params[:object], params[:user])
+            UserMailer.delay.send(params[:theme], params[:object], decorated_user)
           end
         when 'Feedback'
-          FeedbackMailer.delay.send(params[:theme], params[:object], params[:user])
+          FeedbackMailer.delay.send(params[:theme], params[:object], decorated_user)
         when 'ActivityLines::Corporative::OnlineConference::Question'
-          ActivityLines::Corporative::OnlineConference::QuestionMailer.delay.send(params[:theme], params[:object], params[:user])
+          ActivityLines::Corporative::OnlineConference::QuestionMailer.delay.send(params[:theme], params[:object], decorated_user)
         when 'ActivityLines::Corporative::Confession'
-          ActivityLines::Corporative::ConfessionMailer.delay.send(params[:theme], params[:object], params[:user])
+          ActivityLines::Corporative::ConfessionMailer.delay.send(params[:theme], params[:object], decorated_user)
         else
-          UserMailer.delay.send(params[:theme], params[:object], params[:user])
+          UserMailer.delay.send(params[:theme], params[:object], decorated_user)
         end
       end
     end