jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3111 from evazion/fix-3099

Browse Source 
Fix #3099: NilClass error for approval API request
This commit is contained in:
Albert Yi
2017-06-05 12:03:18 -07:00
committed by GitHub
parent 339626e8e1 fdf8e7d5d7
commit 494ad99aac
6 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/assets/javascripts/posts.js
View File

@@ -174,6 +174,12 @@
e.preventDefault();
});
if (Danbooru.meta("current-user-can-approve-posts") === "true") {
Danbooru.keydown("shift+o", "approve", function(e) {
$("#quick-mod-approve").click();
});
}
Danbooru.keydown("a", "prev_page", Danbooru.Post.nav_prev);
Danbooru.keydown("d", "next_page", Danbooru.Post.nav_next);
Danbooru.keydown("f", "favorite", Danbooru.Post.favorite);
@@ -506,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);
}
});
}