mirror of
https://github.com/discourse/discourse.git
synced 2025-08-20 18:52:44 +08:00
FIX: recalculate respects default invitee trust level (#32393)
Currently, trust level is calculated with this formula: `[granted_trust_level, previous_trust_level, SiteSetting.default_trust_level].max` When a user is invited, SiteSetting.default_invitee_trust_level should be respected in that calculation.
This commit is contained in:
parent
e4c70e37cc
commit
25938208ff
2 changed files with 25 additions and 1 deletions
|
@ -37,8 +37,15 @@ class TrustLevel
|
|||
# Then consider the group locked level (or the previous trust level)
|
||||
granted_trust_level = user.group_granted_trust_level || 0
|
||||
previous_trust_level = use_previous_trust_level ? find_previous_trust_level(user) : 0
|
||||
invitee_trust_level =
|
||||
user.invited_user&.redeemed_at ? SiteSetting.default_invitee_trust_level : 0
|
||||
|
||||
[granted_trust_level, previous_trust_level, SiteSetting.default_trust_level].max
|
||||
[
|
||||
granted_trust_level,
|
||||
previous_trust_level,
|
||||
invitee_trust_level,
|
||||
SiteSetting.default_trust_level,
|
||||
].max
|
||||
end
|
||||
|
||||
private
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue