Change account deletion page to have better explanations (#11753)
Fix deletion of unconfirmed account not freeing up the username Add prefill of logged-in user's email in the reconfirmation form
This commit is contained in:
parent
c1e238a77b
commit
43f56f1291
7 changed files with 77 additions and 23 deletions
|
@ -61,6 +61,7 @@ class SuspendAccountService < BaseService
|
|||
return if !@account.local? || @account.user.nil?
|
||||
|
||||
if @options[:including_user]
|
||||
@options[:destroy] = true if !@account.user_confirmed? || @account.user_pending?
|
||||
@account.user.destroy
|
||||
else
|
||||
@account.user.disable!
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue