codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-17 19:12:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: cannot show email for pending/inactive users

Browse source
This commit is contained in:
Régis Hanol 2014-10-29 01:06:59 +01:00
parent 3dcccb5dee
commit 865194f409
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/users_controller.rb
View file

@ -94,7 +94,7 @@ class UsersController < ApplicationController
end end
def check_emails def check_emails
user = fetch_user_from_params user = fetch_user_from_params(include_inactive: true)
guardian.ensure_can_check_emails!(user) guardian.ensure_can_check_emails!(user)
StaffActionLogger.new(current_user).log_check_email(user, context: params[:context]) StaffActionLogger.new(current_user).log_check_email(user, context: params[:context])

12
spec/controllers/users_controller_spec.rb
View file

@ -521,7 +521,7 @@ describe UsersController do
xhr :post, :create, create_params xhr :post, :create, create_params
json = JSON::parse(response.body) json = JSON::parse(response.body)
json["success"].should_not == true json["success"].should_not == true
# should not change the session # should not change the session
session["user_created_email"].should be_blank session["user_created_email"].should be_blank
end end
@ -1411,6 +1411,16 @@ describe UsersController do
json["associated_accounts"].should be_present json["associated_accounts"].should be_present
end end
it "works on inactive users" do
inactive_user = Fabricate(:user, active: false)
Guardian.any_instance.expects(:can_check_emails?).returns(true)
xhr :put, :check_emails, username: inactive_user.username
response.should be_success
json = JSON.parse(response.body)
json["email"].should be_present
json["associated_accounts"].should be_present
end
end end
end end