Change how unconfirmed accounts are displayed in admin UI (#17874)

Fix #17815
2022-03-26 02:53:13 +01:00
parent 52813830be
commit 2dd30804b6
3 changed files with 7 additions and 3 deletions
--- 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