Rebuild rubocop TODOs after auto-correcting
This commit is contained in:
parent
31c50255e9
commit
84dbb52d11
580 changed files with 3689 additions and 3133 deletions
|
|
@ -1,3 +1,5 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
module Api
|
||||
module V1
|
||||
class ConferencesController < Api::BaseController
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
module Api
|
||||
module V1
|
||||
class EventsController < Api::BaseController
|
||||
|
|
@ -10,9 +12,7 @@ module Api
|
|||
def index
|
||||
events = Event.includes(:track, :event_type, event_users: :user)
|
||||
|
||||
if @conference
|
||||
events = events.where(program: @conference.program)
|
||||
end
|
||||
events = events.where(program: @conference.program) if @conference
|
||||
|
||||
respond_with events.confirmed, callback: params[:callback]
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
module Api
|
||||
module V1
|
||||
class RoomsController < Api::BaseController
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
module Api
|
||||
module V1
|
||||
class TracksController < Api::BaseController
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue