diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 735f4b8ec..1e03672ac 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -512,23 +512,18 @@ } Danbooru.Post.approve = function(post_id) { - $.ajax({ - type: "POST", - url: "/moderator/post/approval.json", - data: {"post_id": post_id}, - dataType: "json", - success: function(data) { - if (!data.success) { - Danbooru.error("Error: " + data.reason); - } else { - var $post = $("#post_" + post_id); - if ($post.length) { - $post.data("flags", $post.data("flags").replace(/pending/, "")); - $post.removeClass("post-status-pending"); - } - Danbooru.notice("Approved post #" + post_id); - $("#pending-approval-notice").hide(); - } + $.post( + "/moderator/post/approval.json", + {"post_id": post_id} + ).fail(function(data) { + var message = $.map(data.responseJSON.errors, function(msg, attr) { return msg; }).join("; "); + Danbooru.error("Error: " + message); + }).done(function(data) { + var $post = $("#post_" + post_id); + if ($post.length) { + $post.data("flags", $post.data("flags").replace(/pending/, "")); + $post.removeClass("post-status-pending"); + Danbooru.notice("Approved post #" + post_id); } }); } diff --git a/app/controllers/moderator/post/approvals_controller.rb b/app/controllers/moderator/post/approvals_controller.rb index 1da5998e2..c0e18b644 100644 --- a/app/controllers/moderator/post/approvals_controller.rb +++ b/app/controllers/moderator/post/approvals_controller.rb @@ -9,7 +9,7 @@ module Moderator cookies.permanent[:moderated] = Time.now.to_i post = ::Post.find(params[:post_id]) @approval = post.approve! - respond_with(@approval) + respond_with(:moderator, @approval) end end end diff --git a/app/views/moderator/post/approvals/create.json.erb b/app/views/moderator/post/approvals/create.json.erb deleted file mode 100644 index 2c0a105b0..000000000 --- a/app/views/moderator/post/approvals/create.json.erb +++ /dev/null @@ -1 +0,0 @@ -{"success": <%= @post.errors.empty? %>, "reason": <%= raw @post.errors.full_messages.join("; ").to_json %>}