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

FIX: better error message when trying to approve post for closed/deleted topic

Browse Source
This commit is contained in:
Arpit Jalan
2016-06-24 14:06:27 +05:30
parent 789a6aeb21
commit 3232ce8265
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/queued_posts_controller.rb
View File

@ -25,13 +25,17 @@ class QueuedPostsController < ApplicationController
end
state = params[:queued_post][:state]
if state == 'approved'
qp.approve!(current_user)
elsif state == 'rejected'
qp.reject!(current_user)
if params[:queued_post][:delete_user] == 'true' && guardian.can_delete_user?(qp.user)
UserDestroyer.new(current_user).destroy(qp.user, user_deletion_opts)
begin
if state == 'approved'
qp.approve!(current_user)
elsif state == 'rejected'
qp.reject!(current_user)
if params[:queued_post][:delete_user] == 'true' && guardian.can_delete_user?(qp.user)
UserDestroyer.new(current_user).destroy(qp.user, user_deletion_opts)
end
end
rescue StandardError => e
return render_json_error e.message
end
render_serialized(qp, QueuedPostSerializer, root: :queued_posts)