hound fixes
This commit is contained in:
parent
e8990bfb12
commit
fc753282d3
14 changed files with 180 additions and 144 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue