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

UX: when deleting a user, show a modal indicating that the delete is happening. User hijack so requests don't time out.

Browse Source
This commit is contained in:
Neil Lalonde
2018-05-03 16:18:19 -04:00
parent 3a145b7551
commit a0447b47e0
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/admin/models/admin-user.js.es6
View File

@ -412,6 +412,7 @@ const AdminUser = Discourse.User.extend({
location = document.location.pathname; location = document.location.pathname;
const performDestroy = function(block) { const performDestroy = function(block) {
bootbox.dialog(I18n.t('admin.user.deleting_user'));
let formData = { context: location }; let formData = { context: location };
if (block) { if (block) {
formData["block_email"] = true; formData["block_email"] = true;

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

@ -46,10 +46,12 @@ class Admin::UsersController < Admin::AdminController
end end
def delete_all_posts def delete_all_posts
@user = User.find_by(id: params[:user_id]) hijack do
@user.delete_all_posts!(guardian) user = User.find_by(id: params[:user_id])
# staff action logs will have an entry for each post user.delete_all_posts!(guardian)
render body: nil # staff action logs will have an entry for each post
render body: nil
end
end end
def suspend def suspend
@ -362,20 +364,23 @@ class Admin::UsersController < Admin::AdminController
def destroy def destroy
user = User.find_by(id: params[:id].to_i) user = User.find_by(id: params[:id].to_i)
guardian.ensure_can_delete_user!(user) guardian.ensure_can_delete_user!(user)
begin
options = params.slice(:block_email, :block_urls, :block_ip, :context, :delete_as_spammer)
options[:delete_posts] = ActiveModel::Type::Boolean.new.cast(params[:delete_posts])
if UserDestroyer.new(current_user).destroy(user, options) options = params.slice(:block_email, :block_urls, :block_ip, :context, :delete_as_spammer)
render json: { deleted: true } options[:delete_posts] = ActiveModel::Type::Boolean.new.cast(params[:delete_posts])
else
render json: { hijack do
deleted: false, begin
user: AdminDetailedUserSerializer.new(user, root: false).as_json 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
}
end
rescue UserDestroyer::PostsExistError
raise Discourse::InvalidAccess.new("User #{user.username} has #{user.post_count} posts, so can't be deleted.")
end end
rescue UserDestroyer::PostsExistError
raise Discourse::InvalidAccess.new("User #{user.username} has #{user.post_count} posts, so can't be deleted.")
end end
end end

1
config/locales/client.en.yml
View File

@ -3608,6 +3608,7 @@ en:
delete_confirm: "Are you SURE you want to delete this user? This is permanent!" delete_confirm: "Are you SURE you want to delete this user? This is permanent!"
delete_and_block: "Delete and <b>block</b> this email and IP address" delete_and_block: "Delete and <b>block</b> this email and IP address"
delete_dont_block: "Delete only" delete_dont_block: "Delete only"
deleting_user: "Deleting user..."
deleted: "The user was deleted." deleted: "The user was deleted."
delete_failed: "There was an error deleting that user. Make sure all posts are deleted before trying to delete the user." delete_failed: "There was an error deleting that user. Make sure all posts are deleted before trying to delete the user."
send_activation_email: "Send Activation Email" send_activation_email: "Send Activation Email"