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:
evazion
2017-01-19 22:24:53 +00:00
parent 75c13cc953
commit 7486bb0add
4 changed files with 28 additions and 9 deletions

View File

@@ -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")