From 1d54559f2d66f5593ec5ca1b9b97e5f84bb74617 Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 11 Oct 2024 09:17:21 +0100 Subject: [PATCH] Display banner when unconfirmed email changes --- app/controllers/users_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 72f5c453e..b7c323ca1 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -60,6 +60,7 @@ class UsersController < ApplicationController def update validate_attributes + unconfirmed_email_changed = @user.unconfirmed_email.present? && @user.unconfirmed_email != user_params[:email] && @user.email != user_params[:email] if @user.errors.empty? && @user.update(user_params_without_org) if @user == current_user bypass_sign_in @user @@ -83,7 +84,7 @@ class UsersController < ApplicationController @user.reactivate! @user.send_confirmation_instructions flash[:notice] = I18n.t("devise.activation.reactivated", user_name:) - elsif @user.saved_changes? + elsif @user.saved_changes? || unconfirmed_email_changed flash[:notice] = I18n.t("notification.user_updated.other", name: @user.name) end