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

hound fixes

Browse source
This commit is contained in:
Stella Rouzi 2014-06-26 15:43:24 +03:00
parent e8990bfb12
commit fc753282d3
14 changed files with 180 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,15 @@
class Api::V1::EventsController < Api::BaseController
respond_to :json
module Api
module V1
class EventsController < Api::BaseController
respond_to :json
def index
events = Event.includes(:conference, :track, :room, :event_type, {:event_user => :user})
unless params[:conference_id].blank?
events = events.where("conferences.guid" => params[:conference_id])
def index
events = Event.includes(:conference, :track, :room, :event_type, event_user: :user)
unless params[:conference_id].blank?
events = events.where('conferences.guid' => params[:conference_id])
end
respond_with events.confirmed
end
end
respond_with events.confirmed
end
end