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/call_for_paper.rb
View file

@ -47,7 +47,7 @@ class CallForPaper < ActiveRecord::Base
&& (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_template.blank?
&& !self.conference.email_settings.call_for_papers_dates_updates_body.blank?
end
##
# Checks whether cfp dates is updated
@ -60,7 +60,7 @@ class CallForPaper < ActiveRecord::Base
&& (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_template.blank?
&& !self.conference.email_settings.call_for_papers_dates_updates_body.blank?
end
def remaining_days(date = Date.today)