jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #2851: Account deletion should remove name change requests.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/user_name_change_request.rb
View File

@@ -19,11 +19,11 @@ class UserNameChangeRequest < ActiveRecord::Base
where(:status => "approved")
end
def self.visible
if CurrentUser.is_admin?
def self.visible(viewer = CurrentUser.user)
if viewer.is_admin?
all
elsif CurrentUser.is_member?
where("user_name_change_requests.status = 'approved' OR user_name_change_requests.user_id = ?", CurrentUser.id)
elsif viewer.is_member?
joins(:user).merge(User.undeleted).where("user_name_change_requests.status = 'approved' OR user_name_change_requests.user_id = ?", viewer.id)
else
none
end