github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-30 04:23:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Show a json api response when deleting a user with posts

Browse Source 
A 500 error was actually caused with no response when using the api, so
it wasn't very clear that you need to delete the posts first when using
the api.
This commit is contained in:
Blake Erickson 2018-05-10 13:04:36 -06:00
parent 186623acd0
commit bd352a17bf
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -379,7 +379,10 @@ class Admin::UsersController < Admin::AdminController
} }
end end
rescue UserDestroyer::PostsExistError rescue UserDestroyer::PostsExistError
raise Discourse::InvalidAccess.new("User #{user.username} has #{user.post_count} posts, so can't be deleted.") render json: {
deleted: false,
message: "User #{user.username} has #{user.post_count} posts, so they can't be deleted."
}
end end
end end
end end

6
spec/controllers/admin/users_controller_spec.rb
View File

@ -529,9 +529,11 @@ describe Admin::UsersController do
_post = create_post(topic: topic, user: delete_me) _post = create_post(topic: topic, user: delete_me)
end end
it "returns an error" do it "returns an api response that the user can't be deleted because it has posts" do
delete :destroy, params: { id: delete_me.id }, format: :json delete :destroy, params: { id: delete_me.id }, format: :json
expect(response).to be_forbidden expect(response).to be_success
json = ::JSON.parse(response.body)
expect(json['deleted']).to eq(false)
end end
it "doesn't return an error if delete_posts == true" do it "doesn't return an error if delete_posts == true" do