diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-03-26 02:53:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-26 02:53:13 +0100 |
| commit | 2dd30804b62f750c2780b7043318cbe00d137429 (patch) | |
| tree | 5b772bdad0c7e11d459f190d3be71e2e0be5e172 /app/models/user.rb | |
| parent | 52813830bee5607332b49bee2916956286ec5dc1 (diff) | |
Change how unconfirmed accounts are displayed in admin UI (#17874)
Fix #17815
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 146bdcd2a..f2d9c49eb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -208,8 +208,12 @@ class User < ApplicationRecord confirmed? && approved? && !disabled? && !account.suspended? && !account.memorial? && account.moved_to_account_id.nil? end + def unconfirmed? + !confirmed? + end + def unconfirmed_or_pending? - !(confirmed? && approved?) + unconfirmed? || pending? end def inactive_message |