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

Add a link that allows you to send activation email again

Browse Source
This commit is contained in:
Neil Lalonde
2013-02-22 11:49:48 -05:00
parent 45ab3ab892
commit ff3e012034
11 changed files with 106 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/session_controller.rb
View File

@ -27,7 +27,7 @@ class SessionController < ApplicationController
render_serialized(@user, UserSerializer)
return
else
render :json => {error: I18n.t("login.not_activated")}
render :json => {error: I18n.t("login.not_activated"), reason: 'not_activated', sent_to_email: @user.email_logs.where(email_type: 'signup').order('created_at DESC').first.try(:to_address), current_email: @user.email}
return
end
end

10
app/controllers/users_controller.rb
View File

@ -292,6 +292,16 @@ class UsersController < ApplicationController
render :layout => 'no_js'
end
def send_activation_email
@user = fetch_user_from_params
@email_token = @user.email_tokens.unconfirmed.active.first
if @user
@email_token = @user.email_tokens.create(email: @user.email) if @email_token.nil?
Jobs.enqueue(:user_email, type: :signup, user_id: @user.id, email_token: @email_token.token)
end
render nothing: true
end
def search_users
term = params[:term].to_s.strip
topic_id = params[:topic_id]