From 650459f93c6b599c1041ff87f8a78da7fb05cb9d Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Fri, 19 Jul 2019 23:13:21 +0200
Subject: Fix some flash notices/alerts staying on unrelated pages (#11364)
---
.../settings/two_factor_authentication/confirmations_controller.rb | 2 +-
.../settings/two_factor_authentication/recovery_codes_controller.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'app/controllers/settings')
diff --git a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
index d87117a50..02652a36c 100644
--- a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
@@ -14,7 +14,7 @@ module Settings
def create
if current_user.validate_and_consume_otp!(confirmation_params[:code])
- flash[:notice] = I18n.t('two_factor_authentication.enabled_success')
+ flash.now[:notice] = I18n.t('two_factor_authentication.enabled_success')
current_user.otp_required_for_login = true
@recovery_codes = current_user.generate_otp_backup_codes!
diff --git a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
index c78166c65..874bf532b 100644
--- a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
@@ -10,7 +10,7 @@ module Settings
def create
@recovery_codes = current_user.generate_otp_backup_codes!
current_user.save!
- flash[:notice] = I18n.t('two_factor_authentication.recovery_codes_regenerated')
+ flash.now[:notice] = I18n.t('two_factor_authentication.recovery_codes_regenerated')
render :index
end
end
--
cgit