Merge branch 'release/0.11.10.2'

ulmic · Jan 5, 2017 · f563252 · f563252
2 parents 9d54b85 + 4002966
commit f563252
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/app/decorators/user_decorator.rb b/app/decorators/user_decorator.rb
@@ -47,9 +47,6 @@ def main_current_position
     nil
   end
 
-  def notificable_email
-    (object.present? && object.corporate_email.present?) ? object.corporate_email : object.email
-  end
 
   private
 

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -98,4 +98,8 @@ def subscribe_token(subscription = nil)
   def has_permission_to?(action, type)
     Organization::Permissions.send(type)[action].map(&:id).include? self.id
   end
+
+  def notificable_email
+    corporate_email.present? ? corporate_email : email
+  end
 end
diff --git a/lib/notifications/types/email.rb b/lib/notifications/types/email.rb
@@ -2,24 +2,23 @@ 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], decorated_user)
+          NewsMailer.delay.send(params[:theme], params[:object], params[:user])
         when 'Questionary'
           if QuestionaryMailer.respond_to? params[:theme]
-            QuestionaryMailer.delay.send(params[:theme], params[:object], decorated_user)
+            QuestionaryMailer.delay.send(params[:theme], params[:object], params[:user])
           else
-            UserMailer.delay.send(params[:theme], params[:object], decorated_user)
+            UserMailer.delay.send(params[:theme], params[:object], params[:user])
           end
         when 'Feedback'
-          FeedbackMailer.delay.send(params[:theme], params[:object], decorated_user)
+          FeedbackMailer.delay.send(params[:theme], params[:object], params[:user])
         when 'ActivityLines::Corporative::OnlineConference::Question'
-          ActivityLines::Corporative::OnlineConference::QuestionMailer.delay.send(params[:theme], params[:object], decorated_user)
+          ActivityLines::Corporative::OnlineConference::QuestionMailer.delay.send(params[:theme], params[:object], params[:user])
         when 'ActivityLines::Corporative::Confession'
-          ActivityLines::Corporative::ConfessionMailer.delay.send(params[:theme], params[:object], decorated_user)
+          ActivityLines::Corporative::ConfessionMailer.delay.send(params[:theme], params[:object], params[:user])
         else
-          UserMailer.delay.send(params[:theme], params[:object], decorated_user)
+          UserMailer.delay.send(params[:theme], params[:object], params[:user])
         end
       end
     end