Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
Fix #17815
This commit is contained in:
Eugen Rochko 2022-03-26 02:53:13 +01:00 • committed by GitHub
parent 52813830be
commit 2dd30804b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/user.rb
View file

@ -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