github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 08:09:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2832 from techAPJ/patch-1

Browse Source 
add user email on account created page
This commit is contained in:
Jeff Atwood 2014-10-01 04:27:59 -07:00
commit 7a0b1c1dff
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/controllers/create-account.js.es6
View File

@ -362,9 +362,10 @@ export default DiscourseController.extend(ModalFunctionality, {
if (result.success) {
// Trigger the browser's password manager using the hidden static login form:
var $hidden_login_form = $('#hidden-login-form');
var account_created_url = Discourse.getURL('/users/' + self.get('accountUsername') + '/account-created');
$hidden_login_form.find('input[name=username]').val(attrs.accountName);
$hidden_login_form.find('input[name=password]').val(attrs.accountPassword);
$hidden_login_form.find('input[name=redirect]').val(Discourse.getURL('/users/account-created'));
$hidden_login_form.find('input[name=redirect]').val(account_created_url);
$hidden_login_form.submit();
} else {
self.flash(result.message || I18n.t('create_account.failed'), 'error');

5
app/controllers/users_controller.rb
View File

@ -338,6 +338,11 @@ class UsersController < ApplicationController
end
def account_created
params.require(:username)
@user = User.find_by_username_or_email(params[:username].to_s)
raise Discourse::NotFound unless @user
expires_now
render layout: 'no_js'
end

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

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

2
config/locales/server.en.yml
View File

@ -1087,7 +1087,7 @@ en:
incorrect_username_email_or_password: "Incorrect username, email or password"
wait_approval: "Thanks for signing up. We will notify you when your account has been approved."
active: "Your account is activated and ready to use."
activate_email: "You're almost done! We sent an activation mail to the email address you provided. Please follow the instructions in the email to activate your account."
activate_email: "<p>You're almost done! We sent an activation mail to <b>%{email}</b>. Please follow the instructions in the email to activate your account.</p><p>If it doesn't arrive, check your spam folder, or try to log in again to send another activation mail.</p>"
not_activated: "You can't log in yet. We sent an activation email to you. Please follow the instructions in the email to activate your account."
not_allowed_from_ip_address: "You can't login as %{username} from that IP address."
suspended: "You can't log in until %{date}."

2
config/routes.rb
View File

@ -207,7 +207,7 @@ Discourse::Application.routes.draw do
post "users/read-faq" => "users#read_faq"
get "users/search/users" => "users#search_users"
get "users/account-created/" => "users#account_created"
get "users/:username/account-created" => "users#account_created", constraints: {username: USERNAME_ROUTE_FORMAT}
get "users/password-reset/:token" => "users#password_reset"
put "users/password-reset/:token" => "users#password_reset"
get "users/activate-account/:token" => "users#activate_account"