IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 01:16:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Don't fail silently when updating a record.

Browse Source
This commit is contained in:
Guo Xiang Tan 2017-11-29 08:01:13 +08:00
parent 44ee388070
commit bb0b7b61d7
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/group_user.rb
View File

@ -65,10 +65,11 @@ class GroupUser < ActiveRecord::Base
def grant_trust_level def grant_trust_level
return if group.grant_trust_level.nil? return if group.grant_trust_level.nil?
if (user.group_locked_trust_level || 0) < group.grant_trust_level if (user.group_locked_trust_level || 0) < group.grant_trust_level
user.group_locked_trust_level = group.grant_trust_level user.update!(group_locked_trust_level: group.grant_trust_level)
user.save
end end
TrustLevelGranter.grant(group.grant_trust_level, user) TrustLevelGranter.grant(group.grant_trust_level, user)
end end
@ -84,14 +85,10 @@ class GroupUser < ActiveRecord::Base
if highest_level.nil? if highest_level.nil?
# If the user no longer has a group with a trust level, # If the user no longer has a group with a trust level,
# unlock them, start at 0 and consider promotions. # unlock them, start at 0 and consider promotions.
user.group_locked_trust_level = nil user.update!(group_locked_trust_level: nil)
user.save
Promotion.recalculate(user) Promotion.recalculate(user)
else else
user.group_locked_trust_level = highest_level user.update!(group_locked_trust_level: highest_level)
user.save
user.change_trust_level!(highest_level) user.change_trust_level!(highest_level)
end end
end end