IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

discourse#2591

Browse Source
This commit is contained in:
Ben Lubar
2014-07-27 12:12:36 -05:00
parent 44dc4b4a17
commit ac8c2e1e07
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/serializers/user_serializer.rb
View File

@@ -43,7 +43,8 @@ class UserSerializer < BasicUserSerializer
:suspended_till,
:uploaded_avatar_id,
:badge_count,
:has_title_badges
:has_title_badges,
:edit_history_public
has_one :invited_by, embed: :object, serializer: BasicUserSerializer
has_many :custom_groups, embed: :object, serializer: BasicGroupSerializer
@@ -77,8 +78,7 @@ class UserSerializer < BasicUserSerializer
:gravatar_avatar_upload_id,
:custom_avatar_upload_id,
:custom_fields,
:has_title_badges,
:edit_history_public
:has_title_badges
###
### ATTRIBUTES
@@ -237,4 +237,7 @@ class UserSerializer < BasicUserSerializer
object.badges.where(allow_title: true).count > 0
end
def include_edit_history_public?
can_edit && !SiteSetting.edit_history_visible_to_public
end
end