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

Fix API endpoints conferences/id/rooms/ & tracks/ issue #874

Browse source
This commit is contained in:
Nishanth Vijayan 2016-03-13 21:19:58 +05:30
parent cb9cf0359b
commit 55cfc8ff60
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/api/v1/rooms_controller.rb
View file

@ -8,8 +8,7 @@ module Api
if params[:conference_id].blank? if params[:conference_id].blank?
rooms = Room.all rooms = Room.all
else else
conference = Conference.find_by_guid(params[:conference_id]) @conference.venue ? (rooms = @conference.venue.rooms) : (rooms = [])
rooms = conference.venue.rooms if conference.venue
end end
respond_with rooms respond_with rooms
end end

2
app/controllers/api/v1/tracks_controller.rb
View file

@ -5,7 +5,7 @@ module Api
respond_to :json respond_to :json
def index def index
@conference ? (tracks = @conference.tracks) : (tracks = Track.all) @conference ? (tracks = @conference.program.tracks) : (tracks = Track.all)
respond_with tracks respond_with tracks
end end