rebase against email settings changes

This commit is contained in:
Stella Rouzi 2015-10-29 14:03:34 +02:00 committed by Henne Vogelsang
parent 444356fbc7
commit feabbfbc99
5 changed files with 21 additions and 21 deletions

View file

@ -19,9 +19,9 @@ class Cfp < ActiveRecord::Base
def notify_on_cfp_date_update?
!self.end_date.blank? && !self.start_date.blank?\
&& (self.start_date_changed? || self.end_date_changed?)\
&& self.program.conference.email_settings.send_on_cfp_dates_updates\
&& !self.program.conference.email_settings.cfp_dates_updates_subject.blank?\
&& !self.program.conference.email_settings.cfp_dates_updates_template.blank?
&& self.program.conference.email_settings.send_on_cfp_dates_updated\
&& !self.program.conference.email_settings.cfp_dates_updated_subject.blank?\
&& !self.program.conference.email_settings.cfp_dates_updated_body.blank?
end
##