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

Merge 1752a292ab into 3bf8b2472d

Browse source
This commit is contained in:
Jon Kimble 2017-03-01 05:16:47 +00:00 • committed by GitHub
commit af4da7a9f8
2 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/models/conference.rb
View file

@ -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
#

4
app/serializers/conference_serializer.rb
View file

@ -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