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

Review Changes for f4f8a293e7.

Browse Source
This commit is contained in:
Guo Xiang Tan
2018-02-20 14:44:51 +08:00
parent f4f8a293e7
commit 14f3594f9f
47 changed files with 843 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/serializers/admin_detailed_user_serializer.rb
View File

@ -36,17 +36,12 @@ class AdminDetailedUserSerializer < AdminUserSerializer
has_one :tl3_requirements, serializer: TrustLevel3RequirementsSerializer, embed: :objects
has_many :groups, embed: :object, serializer: BasicGroupSerializer
def include_second_factor_enabled?
scope.is_staff?
def second_factor_enabled
object.totp_enabled?
end
def can_disable_second_factor
(object.id && object.id != scope.user.try(:id)) &&
scope.is_staff?
end
def second_factor_enabled
SecondFactorHelper.totp_enabled?(object)
object&.id != scope.user.id
end
def can_revoke_admin

7
app/serializers/user_serializer.rb
View File

@ -1,5 +1,3 @@
require 'rqrcode'
class UserSerializer < BasicUserSerializer
attr_accessor :omit_stats,
@ -149,12 +147,11 @@ class UserSerializer < BasicUserSerializer
end
def include_second_factor_enabled?
(object.id && object.id == scope.user.try(:id)) ||
scope.is_staff?
(object&.id == scope.user&.id) || scope.is_staff?
end
def second_factor_enabled
SecondFactorHelper.totp_enabled?(object)
object.totp_enabled?
end
def can_change_bio