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

Merge pull request #931 from nishanthvijayan/fix-api-events-speakers

Browse source 
Fix api controllers events and speakers
This commit is contained in:
Henne Vogelsang 2016-04-01 15:05:26 +02:00
commit c4e782a90c
4 changed files with 81 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/api/v1/events_controller.rb
View file

@ -5,10 +5,10 @@ module Api
respond_to :json
def index
events = Event.includes(:conference, :track, :room, :event_type, event_users: :user)
events = Event.includes(:track, :room, :event_type, event_users: :user)
if @conference
events = events.where(conference: @conference)
events = events.where(program: @conference.program)
end
respond_with events.confirmed

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

@ -6,7 +6,7 @@ module Api
def index
if @conference
users = User.joins(event_users: { event: :conference })
users = User.joins(event_users: { event: { program: :conference} })
users = users.where(conferences: { short_title: @conference.short_title })
else
users = User.joins(:event_users)