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

Merge pull request #659 from bgeuken/fix_registration_dates_given

Browse source 
Fix registration dates given
This commit is contained in:
Christian Bruckmayer 2015-06-15 22:06:42 +02:00
commit 5b6f79bbd8
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/models/conference.rb
View file

@ -140,12 +140,8 @@ class Conference < ActiveRecord::Base
# registration period. # registration period.
# * +true+ -> If today is in the registration period. # * +true+ -> If today is in the registration period.
def registration_open? def registration_open?
today = Date.current registration_dates_given? &&
if registration_period && registration_dates_given? (registration_period.start_date..registration_period.end_date).cover?(Date.current)
(registration_period.start_date..registration_period.end_date).cover?(today)
else
false
end
end end
## ##
@ -155,11 +151,9 @@ class Conference < ActiveRecord::Base
# * +false+ -> If the conference registration dates are not set # * +false+ -> If the conference registration dates are not set
# * +true+ -> If conference registration dates are set # * +true+ -> If conference registration dates are set
def registration_dates_given? def registration_dates_given?
if registration_period && (registration_period.start_date.blank? || registration_period.end_date.blank?) registration_period.present? &&
false registration_period.start_date.present? &&
else registration_period.end_date.present?
true
end
end end
## ##