Fix #2851: Account deletion should remove name change requests.
Hides name change requests for deleted users (username matches /user_[0-9]+~*/).
This commit is contained in:
@@ -729,6 +729,16 @@ class User < ActiveRecord::Base
|
||||
where("level = ?", Levels::ADMIN)
|
||||
end
|
||||
|
||||
# UserDeletion#rename renames deleted users to `user_<1234>~`. Tildes
|
||||
# are appended if the username is taken.
|
||||
def deleted
|
||||
where("name ~ 'user_[0-9]+~*'")
|
||||
end
|
||||
|
||||
def undeleted
|
||||
where("name !~ 'user_[0-9]+~*'")
|
||||
end
|
||||
|
||||
def with_email(email)
|
||||
if email.blank?
|
||||
where("FALSE")
|
||||
|
||||
Reference in New Issue
Block a user