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

js: clean up notice/error messaging.

Browse Source
This commit is contained in:
evazion
2019-08-14 01:46:44 -05:00
parent e000bdb861
commit 8d07ad7390
22 changed files with 50 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/moderator/post/approvals/create.js.erb
View File

@@ -1,11 +1,11 @@
<% if @approval.errors.any? %>
$(window).trigger("danbooru:error", "Error: " + <%= @approval.errors.full_messages.join("; ").to_json.html_safe %>);
Danbooru.error("Error: " + <%= @approval.errors.full_messages.join("; ").to_json.html_safe %>);
<% else %>
if ($("#c-posts #a-show").length) {
location.reload();
} else if ($("#c-moderator-post-queues").length) {
$("#c-moderator-post-queues #post-<%= @approval.post.id %>").hide();
$(window).trigger("danbooru:modqueue_increment_processed");
$(window).trigger("danbooru:notice", "Post was approved");
Danbooru.notice("Post was approved");
}
<% end %>

4
app/views/moderator/post/disapprovals/create.js.erb
View File

@@ -1,11 +1,11 @@
<% if @post_disapproval.errors.any? %>
$(window).trigger("danbooru:error", "Error: " + <%= @post_disapproval.errors.full_messages.join("; ").to_json.html_safe %>);
Danbooru.error("Error: " + <%= @post_disapproval.errors.full_messages.join("; ").to_json.html_safe %>);
<% else %>
if ($("#c-posts #a-show").length) {
location.reload();
} else if ($("#c-moderator-post-queues").length) {
$("#c-moderator-post-queues #post-<%= @post_disapproval.post.id %>").hide();
$(window).trigger("danbooru:modqueue_increment_processed");
$(window).trigger("danbooru:notice", "Post was hidden");
Danbooru.notice("Post was hidden");
}
<% end %>

6
app/views/moderator/post/posts/expunge.js.erb
View File

@@ -1,7 +1,7 @@
<% if @post.errors.any? %>
$(window).trigger("danbooru:error", "<%= j @post.errors.full_messages.join('; ') %>");
Danbooru.error("<%= j @post.errors.full_messages.join('; ') %>");
<% elsif @error %>
$(window).trigger("danbooru:error", "<%= j @error.to_s %>");
Danbooru.error("<%= j @error.to_s %>");
<% else %>
$(window).trigger("danbooru:notice", "Post was permanently deleted");
Danbooru.notice("Post was permanently deleted");
<% end %>

2
app/views/moderator/post/posts/undelete.js.erb
View File

@@ -1,3 +1,3 @@
$("#c-posts #delete").show();
$("#c-posts #undelete").hide();
$(window).trigger("danbooru:notice", "Post was undeleted");
Danbooru.notice("Post was undeleted");