gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

User/Person models merge

Browse source
This commit is contained in:
Stella Rouzi 2014-06-23 19:07:50 +03:00
parent 66b84e3660
commit 23bf55b66c
80 changed files with 1064 additions and 1221 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/events_controller.rb
View file

@ -2,7 +2,7 @@ class Api::V1::EventsController < Api::BaseController
respond_to :json
def index
events = Event.includes(:conference, :track, :room, :event_type, {:event_people => :person})
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

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

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