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

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

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

@ -1,14 +1,18 @@
class Api::V1::SpeakersController < Api::BaseController
respond_to :json
module Api
module V1
class SpeakersController < Api::BaseController
respond_to :json
def index
if params[:conference_id].blank?
people = User.joins(:event_users)
else
people = User.joins(:event_users => {:event => :conference})
people = people.where("conferences.guid" => params[:conference_id])
def index
if params[:conference_id].blank?
users = User.joins(:event_users)
else
users = User.joins(event_users: { event: :conference })
users = users.where('conferences.guid' => params[:conference_id])
end
users = users.where('event_users.event_role' => 'speaker')
render json: users, each_serializer: SpeakerSerializer
end
end
people = people.where("event_users.event_role" => "speaker")
render :json => users, :each_serializer => SpeakerSerializer
end
end