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

Fix a problem where you might see missing {{sentTo}} value after a failed login

Browse Source
This commit is contained in:
Neil Lalonde
2013-04-18 16:44:56 -04:00
parent f76d6c0f3f
commit cbe0168922
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/session_controller.rb
View File

@ -27,7 +27,12 @@ class SessionController < ApplicationController
render_serialized(@user, UserSerializer) render_serialized(@user, UserSerializer)
return return
else else
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} 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) || @user.email,
current_email: @user.email
}
return return
end end
end end