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

FIX: Consistency about our response for invalid user id in Admin::UsersController.

Browse Source
This commit is contained in:
Guo Xiang Tan
2018-12-15 08:01:35 +08:00
parent ef0e84e3d9
commit e9ea0102a5
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,8 @@ class Admin::UsersController < Admin::AdminController
:revoke_api_key,
:anonymize,
:reset_bounce_score,
:disable_second_factor]
:disable_second_factor,
:delete_posts_batch]
def index
users = ::AdminUserIndexQuery.new(params).find_users
@ -46,8 +47,7 @@ class Admin::UsersController < Admin::AdminController
end
def delete_posts_batch
user = User.find_by(id: params[:user_id])
deleted_posts = user.delete_posts_in_batches(guardian)
deleted_posts = @user.delete_posts_in_batches(guardian)
# staff action logs will have an entry for each post
render json: { posts_deleted: deleted_posts.length }
@ -563,6 +563,7 @@ class Admin::UsersController < Admin::AdminController
def fetch_user
@user = User.find_by(id: params[:user_id])
raise Discourse::NotFound unless @user
end
def refresh_browser(user)