Merge pull request #3750 from tgxworld/fix_broken_serializer
FIX: Broken BasicUserSerializer.
This commit is contained in:
commit
43f8b2b41a
|
@ -9,7 +9,7 @@ class BasicUserSerializer < ApplicationSerializer
|
||||||
if Hash === object
|
if Hash === object
|
||||||
User.avatar_template(user[:username], user[:uploaded_avatar_id])
|
User.avatar_template(user[:username], user[:uploaded_avatar_id])
|
||||||
else
|
else
|
||||||
object.avatar_template
|
user.try(:avatar_template)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ class BasicUserSerializer < ApplicationSerializer
|
||||||
if Hash === object
|
if Hash === object
|
||||||
User.letter_avatar_color(user[:username])
|
User.letter_avatar_color(user[:username])
|
||||||
else
|
else
|
||||||
object.letter_avatar_color
|
user.try(:letter_avatar_color)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue