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

FEATURE: Allow sending invites to staged users

Browse Source
This commit is contained in:
Gerhard Schlager
2018-01-19 15:29:15 +01:00
parent f74ac826c5
commit dde0fcc658
7 changed files with 79 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/controllers/users_controller.rb
View File

@ -312,8 +312,6 @@ class UsersController < ApplicationController
params[:for_user_id] ? User.find(params[:for_user_id]) : current_user
end
FROM_STAGED = "from_staged".freeze
def create
params.require(:email)
params.permit(:user_fields)
@ -334,14 +332,9 @@ class UsersController < ApplicationController
return fail_with("login.reserved_username")
end
if user = User.where(staged: true).with_email(params[:email].strip.downcase).first
user_params.each { |k, v| user.send("#{k}=", v) }
user.staged = false
user.active = false
user.custom_fields[FROM_STAGED] = true
else
user = User.new(user_params)
end
new_user_params = user_params
user = User.unstage(new_user_params)
user = User.new(new_user_params) if user.nil?
# Handle API approval
if user.approved
@ -602,7 +595,7 @@ class UsersController < ApplicationController
if user = User.where(id: session_user_id.to_i).first
@account_created[:username] = user.username
@account_created[:email] = user.email
@account_created[:show_controls] = !user.custom_fields[FROM_STAGED]
@account_created[:show_controls] = !user.from_staged?
end
end
@ -656,11 +649,7 @@ class UsersController < ApplicationController
@user = User.where(id: user_key.to_i).first
end
if @user.blank? || @user.active? || current_user.present?
raise Discourse::InvalidAccess.new
end
if @user.custom_fields[FROM_STAGED]
if @user.blank? || @user.active? || current_user.present? || @user.from_staged?
raise Discourse::InvalidAccess.new
end