From f180ce0d274f272ace2aa857111fd2e16f89e5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Geuken?= Date: Tue, 19 May 2015 20:04:19 +0200 Subject: [PATCH] Refactor registration_open? method, part II --- app/models/conference.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/models/conference.rb b/app/models/conference.rb index 221af5ba..78fa1999 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -140,12 +140,8 @@ class Conference < ActiveRecord::Base # registration period. # * +true+ -> If today is in the registration period. def registration_open? - today = Date.current - if registration_dates_given? - (registration_period.start_date..registration_period.end_date).cover?(today) - else - false - end + registration_dates_given? && + (registration_period.start_date..registration_period.end_date).cover?(Date.current) end ##