Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)
Change all account actions except "none" to resolve all unresolved reports Refactor `SuspendAccountService` to be more readable
This commit is contained in:
parent
4fe127664b
commit
c5d37f18cb
21 changed files with 98 additions and 45 deletions
|
@ -171,6 +171,10 @@ class User < ApplicationRecord
|
|||
confirmed? && approved? && !disabled? && !account.suspended?
|
||||
end
|
||||
|
||||
def unconfirmed_or_pending?
|
||||
!(confirmed? && approved?)
|
||||
end
|
||||
|
||||
def inactive_message
|
||||
!approved? ? :pending : super
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue