From a88f7c168fb9cb38e9da3b3117cfb247d2f34921 Mon Sep 17 00:00:00 2001 From: Chrisbr Date: Sun, 6 Jul 2014 22:20:17 +0200 Subject: [PATCH] [Bugfix] Implements check if mail templates not nil fix #286 --- app/models/event.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/event.rb b/app/models/event.rb index 53d696e0..ce823b6c 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -125,7 +125,9 @@ class Event < ActiveRecord::Base end def process_confirmation - if conference.email_settings.send_on_confirmed_without_registration? + if conference.email_settings.send_on_confirmed_without_registration? && + conference.email_settings.confirmed_email_template && + conference.email_settings.confirmed_without_registration_subject if conference.registrations.where(user_id: submitter.id).first.nil? Mailbot.confirm_reminder_mail(self).deliver end @@ -134,6 +136,8 @@ class Event < ActiveRecord::Base def process_acceptance(options) if conference.email_settings.send_on_accepted && + conference.email_settings.accepted_email_template && + conference.email_settings.accepted_subject && options[:send_mail].blank? Rails.logger.debug 'Sending event acceptance mail' Mailbot.acceptance_mail(self).deliver @@ -142,6 +146,8 @@ class Event < ActiveRecord::Base def process_rejection(options) if conference.email_settings.send_on_rejected && + conference.email_settings.rejected_email_template && + conference.email_settings.rejected_subject && options[:send_mail].blank? Rails.logger.debug 'Sending rejected mail' Mailbot.rejection_mail(self).deliver