gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactored EmailSetting incosistency. Fixes #603

Browse source
This commit is contained in:
raluka 2015-10-06 11:32:40 +02:00
parent f9c41cf670
commit 0c4b0b4ac1
13 changed files with 99 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/conference.rb
View file

@ -572,7 +572,7 @@ class Conference < ActiveRecord::Base
(self.start_date_changed? || self.end_date_changed?) &&
self.email_settings.send_on_updated_conference_dates &&
!self.email_settings.updated_conference_dates_subject.blank? &&
self.email_settings.updated_conference_dates_template
self.email_settings.updated_conference_dates_body
end
##
@ -586,7 +586,7 @@ class Conference < ActiveRecord::Base
(registration_period.start_date_changed? || registration_period.end_date_changed?) &&
email_settings.send_on_updated_conference_registration_dates &&
!email_settings.updated_conference_registration_dates_subject.blank? &&
email_settings.updated_conference_registration_dates_template
email_settings.updated_conference_registration_dates_body
end
private