Fix SMTP to address not found for delayed job

Refs #2263

2 files changed, 8 insertions, 6 deletions

diff --git a/app/mailers/calendar_mailer.rb b/app/mailers/calendar_mailer.rb
index cc8175a07..e2a368c6c 100644
--- a/app/mailers/calendar_mailer.rb
+++ b/app/mailers/calendar_mailer.rb
@@ -1,11 +1,13 @@
 class CalendarMailer < ApplicationMailer
-  def updated calendar, user
-    @calendar = calendar
+  def updated calendar_id, user_id
+    @calendar = Calendar.find(calendar_id)
+    user      = User.find(user_id)
     mail to: user.email, subject: t('mailers.calendar_mailer.updated.subject')
   end
 
-  def created calendar, user
-    @calendar = calendar
+  def created calendar_id, user_id
+    @calendar = Calendar.find(calendar_id)
+    user      = User.find(user_id)
     mail to: user.email, subject: t('mailers.calendar_mailer.created.subject')
   end
 end
diff --git a/app/models/calendar_observer.rb b/app/models/calendar_observer.rb
index 789805356..c81addff4 100644
--- a/app/models/calendar_observer.rb
+++ b/app/models/calendar_observer.rb
@@ -4,7 +4,7 @@ class CalendarObserver < ActiveRecord::Observer
     return unless calendar.shared
 
     User.with_organisation.each do |user|
-      MailerJob.perform_later('CalendarMailer', 'updated', [calendar, user])
+      MailerJob.perform_later('CalendarMailer', 'updated', [calendar.id, user.id])
     end
   end
 
@@ -12,7 +12,7 @@ class CalendarObserver < ActiveRecord::Observer
     return unless calendar.shared
 
     User.with_organisation.each do |user|
-      MailerJob.perform_later('CalendarMailer', 'created', [calendar, user])
+      MailerJob.perform_later('CalendarMailer', 'created', [calendar.id, user.id])
     end
   end
 end