github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:34:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: resolve flags as good when deleting a spam user

Browse Source
This commit is contained in:
Régis Hanol
2014-10-20 16:59:06 +02:00
parent 4ef9e6e95a
commit 10094a0bcd
6 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,22 +211,31 @@ class Admin::UsersController < Admin::AdminController
end
def reject_bulk
d = UserDestroyer.new(current_user)
success_count = 0
d = UserDestroyer.new(current_user)
User.where(id: params[:users]).each do |u|
success_count += 1 if guardian.can_delete_user?(u) and d.destroy(u, params.slice(:context)) rescue UserDestroyer::PostsExistError
end
render json: {success: success_count, failed: (params[:users].try(:size) || 0) - success_count}
render json: {
success: success_count,
failed: (params[:users].try(:size) || 0) - success_count
}
end
def destroy
user = User.find_by(id: params[:id].to_i)
guardian.ensure_can_delete_user!(user)
begin
if UserDestroyer.new(current_user).destroy(user, params.slice(:delete_posts, :block_email, :block_urls, :block_ip, :context))
render json: {deleted: true}
options = params.slice(:delete_posts, :block_email, :block_urls, :block_ip, :context, :delete_as_spammer)
if UserDestroyer.new(current_user).destroy(user, options)
render json: { deleted: true }
else
render json: {deleted: false, user: AdminDetailedUserSerializer.new(user, root: false).as_json}
render json: {
deleted: false,
user: AdminDetailedUserSerializer.new(user, root: false).as_json
}
end
rescue UserDestroyer::PostsExistError
raise Discourse::InvalidAccess.new("User #{user.username} has #{user.post_count} posts, so can't be deleted.")