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

event: refactor as_json method and add a test

Browse source
This commit is contained in:
Björn Geuken 2015-04-17 16:20:39 +02:00
parent 80f8bba951
commit 82edf7870a
2 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/models/event.rb
View file

@ -99,23 +99,9 @@ class Event < ActiveRecord::Base
def as_json(options)
json = super(options)
if room.nil?
json[:room_guid] = nil
else
json[:room_guid] = room.guid
end
if track.nil?
json[:track_color] = '#ffffff'
else
json[:track_color] = track.color
end
if event_type.nil?
json[:length] = 25
else
json[:length] = event_type.length
end
json[:room_guid] = room.try(:guid)
json[:track_color] = track.try(:color) || '#ffffff'
json[:length] = event_type.try(:length) || 25
json
end