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

Fix email notifications

Browse source
This commit is contained in:
Henne Vogelsang 2016-03-31 16:51:16 +02:00
parent 2e79f65989
commit 14011f8828
9 changed files with 43 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/models/venue.rb
View file

@ -30,15 +30,15 @@ class Venue < ActiveRecord::Base
private
def send_mail_notification
Mailbot.delay.send_email_on_venue_updated(conference) if venue_notify?(conference)
Mailbot.delay.send_email_on_venue_updated(conference) if notify_on_venue_changed?
end
def venue_notify?(conference)
(self.name_changed? || self.street_changed?) &&
(!self.name.blank? && !self.street.blank?) &&
(conference.email_settings.send_on_venue_updated &&
!conference.email_settings.venue_updated_subject.blank? &&
conference.email_settings.venue_updated_body)
def notify_on_venue_changed?
return false unless conference.email_settings.send_on_venue_updated
# do not notify unless the address changed
return false unless self.name_changed? || self.street_changed? || self.city_changed? || self.country_changed?
# do not notify unless the mail content is set up
(!conference.email_settings.venue_updated_subject.blank? && !conference.email_settings.venue_updated_body.blank?)
end
# TODO: create a module to be mixed into model to perform same operation