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

fixes #2876: Changing approver/contributor privileges should log mod action

Browse Source
This commit is contained in:
r888888888
2017-02-14 12:46:54 -08:00
parent ed8a8001f4
commit aa41c41572
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/admin/users_controller.rb
View File

@@ -9,11 +9,8 @@ module Admin
def update def update
@user = User.find(params[:id]) @user = User.find(params[:id])
@user.promote_to!( promotion = UserPromotion.new(@user, CurrentUser.user, params[:user][:level], params[:user])
params[:user][:level], promotion.promote!
:can_approve_posts => params[:user][:can_approve_posts],
:can_upload_free => params[:user][:can_upload_free]
)
redirect_to edit_admin_user_path(@user), :notice => "User updated" redirect_to edit_admin_user_path(@user), :notice => "User updated"
end end
end end

11
app/logical/user_promotion.rb
View File

@@ -22,12 +22,23 @@ class UserPromotion
create_user_feedback unless options[:skip_feedback] create_user_feedback unless options[:skip_feedback]
create_dmail unless options[:skip_dmail] create_dmail unless options[:skip_dmail]
update_saved_searches update_saved_searches
create_mod_actions
user.save user.save
end end
private private
def create_mod_actions
if old_can_approve_posts != user.can_approve_posts?
ModAction.log("#{promoter.name} changed approval privileges for #{user.name} from #{old_can_approve_posts} to [b]#{user.can_approve_posts?}[/b]")
end
if old_can_upload_free != user.can_upload_free?
ModAction.log("#{promoter.name} changed unlimited upload privileges for #{user.name} from #{old_can_upload_free} to [b]#{user.can_upload_free?}[/b]")
end
end
def validate def validate
# admins can do anything # admins can do anything
return if promoter.is_admin? return if promoter.is_admin?