Fix Hakiri issues

This commit is contained in:
Chrisbr 2014-08-27 16:18:35 +02:00
parent e41fa41acf
commit c2a1ff1ffc
5 changed files with 9 additions and 7 deletions

View file

@ -4,9 +4,9 @@ module Api
respond_to :json
def index
events = Event.includes(:conference, :track, :room, :event_type, event_user: :user)
events = Event.includes(:conference, :track, :room, :event_type, event_users: :user)
unless params[:conference_id].blank?
events = events.where('conferences.guid' => params[:conference_id])
events = events.where(conferences: { guid: params[:conference_id] })
end
respond_with events.confirmed
end

View file

@ -8,9 +8,9 @@ module Api
users = User.joins(:event_users)
else
users = User.joins(event_users: { event: :conference })
users = users.where('conferences.guid' => params[:conference_id])
users = users.where(conferences: { guid: params[:conference_id] })
end
users = users.where('event_users.event_role' => 'speaker')
users = users.where(event_users: {event_role: :speaker})
render json: users, each_serializer: SpeakerSerializer
end
end

View file

@ -8,7 +8,7 @@ module Api
tracks = Track.all
else
tracks = Track.joins(:conference)
tracks = tracks.where("conferences.guid" => params[:conference_id])
tracks = tracks.where(conferences: { guid: params[:conference_id] })
end
respond_with tracks
end