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

added more consistency for email_settings

Browse source
This commit is contained in:
raluka 2015-10-14 15:34:23 +02:00
parent 002f8b1bcd
commit 3d57203727
11 changed files with 107 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/models/call_for_paper.rb
View file

@ -45,9 +45,9 @@ class CallForPaper < 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.conference.email_settings.send_on_call_for_papers_dates_updates\
&& !self.conference.email_settings.call_for_papers_dates_updates_subject.blank?\
&& !self.conference.email_settings.call_for_papers_dates_updates_body.blank?
&& self.conference.email_settings.send_on_call_for_papers_dates_updated\
&& !self.conference.email_settings.call_for_papers_dates_updated_subject.blank?\
&& !self.conference.email_settings.call_for_papers_dates_updated_body.blank?
end
##
# Checks whether cfp dates is updated
@ -58,9 +58,9 @@ class CallForPaper < ActiveRecord::Base
def notify_on_schedule_public?
!self.end_date.blank? && !self.start_date.blank?\
&& (self.start_date_changed? || self.end_date_changed?)\
&& self.conference.email_settings.send_on_call_for_papers_dates_updates\
&& !self.conference.email_settings.call_for_papers_dates_updates_subject.blank?\
&& !self.conference.email_settings.call_for_papers_dates_updates_body.blank?
&& self.conference.email_settings.send_on_call_for_papers_dates_updated\
&& !self.conference.email_settings.call_for_papers_dates_updated_subject.blank?\
&& !self.conference.email_settings.call_for_papers_dates_updated_body.blank?
end
def remaining_days(date = Date.today)