github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 19:39:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5357 from techAPJ/invite-trust-level

Browse Source 
FIX: invited users were not granted trust level based on their group
This commit is contained in:
Arpit Jalan
2017-11-23 23:42:20 +05:30
committed by GitHub
parent ad07e6e172 3508046e33
commit 406ad1a1f2
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/invite_redeemer.rb
View File

@ -28,11 +28,6 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
user = User.new(email: invite.email, username: available_username, name: available_name, active: true, trust_level: SiteSetting.default_invitee_trust_level)
if password
user.password_required!
user.password = password
end
if !SiteSetting.must_approve_users? || (SiteSetting.must_approve_users? && invite.invited_by.staff?)
user.approved = true
user.approved_by_id = invite.invited_by_id
@ -52,9 +47,14 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
end
user.moderator = true if invite.moderator? && invite.invited_by.staff?
user.save!
user
if password
user.password = password
user.password_required!
end
user.save!
User.find(user.id)
end
private