mirror of
https://github.com/discourse/discourse.git
synced 2025-09-06 10:50:21 +08:00
Review Changes for https://github.com/discourse/discourse/pull/5612/commits/f4f8a293e74e6a37c7bee7645d9ca1d72a7d5bd3.
This commit is contained in:
parent
f4f8a293e7
commit
14f3594f9f
47 changed files with 843 additions and 492 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue