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

FIX: display total number of other accounts with the same IP address in the IP lookup dialog

Browse Source
This commit is contained in:
Régis Hanol
2014-11-24 19:34:04 +01:00
parent 7b1c001932
commit d3d517108d
6 changed files with 112 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,18 +278,24 @@ class Admin::UsersController < Admin::AdminController
params.require(:exclude)
params.require(:order)
params[:limit] = 50
user_destroyer = UserDestroyer.new(current_user)
options = { delete_posts: true, block_email: true, block_urls: true, block_ip: true, delete_as_spammer: true }
AdminUserIndexQuery.new(params).find_users.each do |user|
AdminUserIndexQuery.new(params).find_users(50).each do |user|
user_destroyer.destroy(user, options) rescue nil
end
render json: success_json
end
def total_other_accounts_with_same_ip
params.require(:ip)
params.require(:exclude)
params.require(:order)
render json: { total: AdminUserIndexQuery.new(params).count_users }
end
def invite_admin
email = params[:email]