github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 13:06:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "FIX: Move check to right serializer."

Browse Source 
This reverts commit 793f933b6b28862dfb7995ef938da4029bc2e10c.
This commit is contained in:
Guo Xiang Tan
2017-09-12 18:11:08 +08:00
parent 793f933b6b
commit 51e1c0b6ce
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/serializers/basic_user_serializer.rb
View File

@ -1,6 +1,10 @@
class BasicUserSerializer < ApplicationSerializer class BasicUserSerializer < ApplicationSerializer
attributes :id, :username, :avatar_template attributes :id, :username, :avatar_template
def include_name?
SiteSetting.enable_names?
end
def avatar_template def avatar_template
if Hash === object if Hash === object
User.avatar_template(user[:username], user[:uploaded_avatar_id]) User.avatar_template(user[:username], user[:uploaded_avatar_id])

4
app/serializers/group_post_user_serializer.rb
View File

@ -1,7 +1,3 @@
class GroupPostUserSerializer < BasicUserSerializer class GroupPostUserSerializer < BasicUserSerializer
attributes :title, :name attributes :title, :name
def include_name?
SiteSetting.enable_names?
end
end end