From dfcbe6b6fad30b17279bce01fb11250547958a57 Mon Sep 17 00:00:00 2001 From: Samuel Date: Fri, 23 May 2025 10:13:47 +0100 Subject: [PATCH] add messaging for not activated users --- app/models/user.rb | 9 ++++++++- config/locales/devise.en.yml | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index f10c9456a..b504db9bc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -271,7 +271,14 @@ class User < ApplicationRecord end def valid_for_authentication? - super && active? + super && account_is_active? + end + + def account_is_active? + unless active? + throw(:warden, message: :inactive_account) + end + true end def editable_duplicate_lettings_logs_sets diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index 58d68497c..d5d50b5f9 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -16,6 +16,7 @@ en: timeout: "Your session expired. Sign in again to continue." unauthenticated: "You need to sign in or sign up before continuing." unconfirmed: "You must confirm your email address before continuing." + inactive_account: "Your account has been deactivated. Ask a data coordinator at your organisation to reactivate your account. Contact the helpdesk if you don't know who your data coordinator is." mailer: confirmation_instructions: subject: "Confirmation instructions."