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

Rebuild rubocop TODOs after auto-correcting

Browse source
This commit is contained in:
James Mason 2018-04-04 10:18:51 -07:00
parent 31c50255e9
commit 84dbb52d11
No known key found for this signature in database
GPG key ID: 1B3951886C449023
580 changed files with 3689 additions and 3133 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,5 @@
# frozen_string_literal: true
module Api
module V1
class SpeakersController < Api::BaseController
@ -9,13 +11,13 @@ module Api
def index
if @conference
users = User.joins(event_users: { event: { program: :conference} })
users = User.joins(event_users: { event: { program: :conference } })
users = users.where(conferences: { short_title: @conference.short_title })
else
users = User.joins(:event_users)
end
users = users.where(event_users: {event_role: :speaker}).uniq
users = users.where(event_users: { event_role: :speaker }).uniq
render json: users, each_serializer: SpeakerSerializer, callback: params['callback']
end
end