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

Merge pull request #2852 from evazion/fix-deleted-name-changes

Browse Source 
Fix #2851: Account deletion should remove name change requests.
This commit is contained in:
Albert Yi
2017-01-20 11:35:54 -08:00
committed by GitHub
parent 33183389db 7486bb0add
commit fa94eafef3
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