diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-11 16:32:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-11 16:32:44 +0200 |
| commit | c5d37f18cb3f4d6212fb8f3e1c4e1e027f677ec5 (patch) | |
| tree | 190b0c85e6e8f3880d9d291781d9a73185e0252c /app/models/user.rb | |
| parent | 4fe127664b0ae22a528b4a4467ab2de92e3da3ef (diff) | |
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
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 95f1d8fc5..78b82a68f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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 |