gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Hakiri issues

Browse source
This commit is contained in:
Chrisbr 2014-08-27 16:18:35 +02:00
parent e41fa41acf
commit c2a1ff1ffc
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,9 +4,9 @@ module Api
respond_to :json
def index
events = Event.includes(:conference, :track, :room, :event_type, event_user: :user)
events = Event.includes(:conference, :track, :room, :event_type, event_users: :user)
unless params[:conference_id].blank?
events = events.where('conferences.guid' => params[:conference_id])
events = events.where(conferences: { guid: params[:conference_id] })
end
respond_with events.confirmed
end