merenber
/
greenlight
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issue with flash messages and activation link (#454)

Browse Source
v2
farhatahmad 4 years ago committed by Jesus Federico
parent c595ba9895
commit 6bd5d81697
2 changed files with 5 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      app/controllers/password_resets_controller.rb
  2. 2
      app/controllers/users_controller.rb

6
app/controllers/password_resets_controller.rb
Unescape View File

@ -30,9 +30,11 @@ class PasswordResetsController < ApplicationController
if @user
@user.create_reset_digest
@user.send_password_reset_email(reset_link)
redirect_to root_url, notice: I18n.t("email_sent")
flash[:success] = I18n.t("email_sent")
redirect_to root_path
else
redirect_to new_password_reset_path, alert: I18n.t("no_user_email_exists")
flash[:alert] = I18n.t("no_user_email_exists")
redirect_to new_password_reset_path
end
rescue => e
logger.error "Error in email delivery: #{e}"

2
app/controllers/users_controller.rb
Unescape View File

@ -39,7 +39,7 @@ class UsersController < ApplicationController
# Start email verification and redirect to root.
begin
@user.send_activation_email(verification_link)
@user.send_activation_email(user_verification_link)
rescue => e
logger.error "Error in email delivery: #{e}"
flash[:alert] = I18n.t(params[:message], default: I18n.t("delivery_error"))