github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-29 20:04:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: The text to users who signed up when approval was required was

Browse Source 
misleading.
This commit is contained in:
Robin Ward 2014-11-04 15:47:32 -05:00
parent cc9b040502
commit c9eb809dad
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/users_controller.rb
View File

@ -245,7 +245,7 @@ class UsersController < ApplicationController
activation.finish activation.finish
# save user email in session, to show on account-created page # save user email in session, to show on account-created page
session["user_created_email"] = user.email session["user_created_message"] = activation.message
render json: { render json: {
success: true, success: true,
@ -364,6 +364,7 @@ class UsersController < ApplicationController
end end
def account_created def account_created
@message = session['user_created_message']
expires_now expires_now
render layout: 'no_js' render layout: 'no_js'
end end

4
app/views/users/account_created.html.erb
View File

@ -1,5 +1,3 @@
<div id='simple-container'> <div id='simple-container'>
<% if session["user_created_email"] %> <span style="font-size: 16px; line-height: 24px;"><%= @message.html_safe %></span>
<span style="font-size: 16px; line-height: 24px;"><%= t('login.activate_email', email: session["user_created_email"]).html_safe %></span>
<% end %>
</div> </div>

12
spec/controllers/users_controller_spec.rb
View File

@ -357,8 +357,8 @@ describe UsersController do
expect(JSON.parse(response.body)['active']).to be_falsey expect(JSON.parse(response.body)['active']).to be_falsey
# should save user_created_email in session # should save user_created_message in session
session["user_created_email"].should == @user.email session["user_created_message"].should be_present
end end
context "and 'must approve users' site setting is enabled" do context "and 'must approve users' site setting is enabled" do
@ -393,8 +393,8 @@ describe UsersController do
User.any_instance.expects(:enqueue_welcome_message).with('welcome_user') User.any_instance.expects(:enqueue_welcome_message).with('welcome_user')
post_user post_user
# should save user_created_email in session # should save user_created_message in session
session["user_created_email"].should == @user.email session["user_created_message"].should be_present
end end
it "shows the 'active' message" do it "shows the 'active' message" do
@ -479,7 +479,7 @@ describe UsersController do
json["success"].should == true json["success"].should == true
# should not change the session # should not change the session
session["user_created_email"].should be_blank session["user_created_message"].should be_blank
end end
end end
@ -523,7 +523,7 @@ describe UsersController do
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_message"].should be_blank
end end
end end