Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

Used the term suspended instead of banned.

Browse source
This commit is contained in:
Neil Lalonde 2013-11-07 13:53:32 -05:00
parent 706f96af0a
commit 0c6f794eb0
57 changed files with 318 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/serializers/admin_detailed_user_serializer.rb
View file

@ -14,11 +14,11 @@ class AdminDetailedUserSerializer < AdminUserSerializer
:private_topics_count,
:can_delete_all_posts,
:can_be_deleted,
:ban_reason
:suspend_reason
has_one :approved_by, serializer: BasicUserSerializer, embed: :objects
has_one :api_key, serializer: ApiKeySerializer, embed: :objects
has_one :banned_by, serializer: BasicUserSerializer, embed: :objects
has_one :suspended_by, serializer: BasicUserSerializer, embed: :objects
def can_revoke_admin
scope.can_revoke_admin?(object)
@ -56,8 +56,8 @@ class AdminDetailedUserSerializer < AdminUserSerializer
api_key.present?
end
def banned_by
object.ban_record.try(:acting_user)
def suspended_by
object.suspend_record.try(:acting_user)
end
end