diff --git a/app/models/conference.rb b/app/models/conference.rb index b5e01a09..0f586b57 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -68,24 +68,6 @@ class Conference < ActiveRecord::Base after_create :create_free_ticket - def date_range_string - startstr = 'Unknown - ' - endstr = 'Unknown' - if start_date.month == end_date.month && start_date.year == end_date.year - startstr = start_date.strftime('%B %d - ') - endstr = end_date.strftime('%d, %Y') - elsif start_date.month != end_date.month && start_date.year == end_date.year - startstr = start_date.strftime('%B %d - ') - endstr = end_date.strftime('%B %d, %Y') - else - startstr = start_date.strftime('%B %d, %Y - ') - endstr = end_date.strftime('%B %d, %Y') - end - - result = startstr + endstr - result - end - ## # Checks if the user is registered to the conference # diff --git a/app/serializers/conference_serializer.rb b/app/serializers/conference_serializer.rb index 2059f37c..bdace955 100644 --- a/app/serializers/conference_serializer.rb +++ b/app/serializers/conference_serializer.rb @@ -58,8 +58,8 @@ class ConferenceSerializer < ActiveModel::Serializer end def date_range - if defined? object.date_range_string - object.date_range_string.try(:split, ',').try(:first) + if defined? date_range_string(object.start_date, object.end_date) + date_range_string(object.start_date, object.end_date).try(:split, ',').try(:first) end end end