autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change account suspensions to be reversible by default (#14726)

Browse Source
This commit is contained in:
Eugen Rochko
2020-09-15 14:37:58 +02:00
committed by GitHub
parent bbcbf12215
commit ed099d8bdc
39 changed files with 526 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user.rb
View File

@ -168,7 +168,7 @@ class User < ApplicationRecord
end
def active_for_authentication?
true
!account.memorial?
end
def suspicious_sign_in?(ip)
@ -176,7 +176,7 @@ class User < ApplicationRecord
end
def functional?
confirmed? && approved? && !disabled? && !account.suspended? && account.moved_to_account_id.nil?
confirmed? && approved? && !disabled? && !account.suspended? && !account.memorial? && account.moved_to_account_id.nil?
end
def unconfirmed_or_pending?