gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests 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

4
app/serializers/event_serializer.rb
View file

@ -10,8 +10,8 @@ class EventSerializer < ActiveModel::Serializer
end
def speaker_ids
speakers = object.event_people.select {|i| i.event_role == "speaker" }
speakers.map {|i| i.person.guid}
speakers = object.event_users.select {|i| i.event_role == "speaker" }
speakers.map {|i| i.user.id}
end
def type

8
app/serializers/speaker_serializer.rb
View file

@ -1,14 +1,10 @@
class SpeakerSerializer < ActiveModel::Serializer
include ActionView::Helpers::TextHelper
attributes :guid, :name, :full_name, :company, :biography
attributes :guid, :name, :affiliation, :biography
def name
object.public_name
end
def full_name
[object.first_name, object.last_name].join(" ")
object.name
end
def biography