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

comment votes: fix error handling.

Browse Source 
Return the comment itself and a standard error response on failure.
This commit is contained in:
evazion
2019-08-19 16:57:38 -05:00
parent b8450671f2
commit 782d9f3d61
8 changed files with 19 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/comment_votes/create.js.erb
View File

@@ -1,8 +1,4 @@
<% if @error %>
Danbooru.error("<%= j @error.to_s %>");
<% elsif @comment_vote.errors.any? %>
Danbooru.error("<%= j @comment_vote.errors.full_messages.join('; ') %>");
<% elsif @comment_vote.is_negative? %>
<% if @comment_vote.is_negative? %>
$(".comment[data-comment-id=<%= @comment.id %>]").remove();
<% end %>

7
app/views/comment_votes/create.json.erb
View File

@@ -1,7 +0,0 @@
<% if @error %>
{"success": false, "errors": <%= @error.to_s.to_json.html_safe %>}
<% elsif @comment_vote.errors.any? %>
{"success": false, "errors": <%= @comment_vote.errors.full_messages.to_json.html_safe %>}
<% else %>
{"success": true}
<% end %>

6
app/views/comment_votes/create.xml.erb
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<% if @comment_vote.errors.any? %>
<response success="false"><%= @comment_vote.errors.full_messages.to_json.html_safe %></response>
<% else %>
<response success="true"/>
<% end %>

10
app/views/comment_votes/destroy.js.erb
View File

@@ -1,7 +1,3 @@
<% if @error %>
Danbooru.error("<%= j @error.to_s %>");
<% else %>
$("#comment-vote-up-link-for-<%= @comment.id %>").show();
$("#comment-vote-down-link-for-<%= @comment.id %>").show();
$("#comment-unvote-link-for-<%= @comment.id %>").hide();
<% end %>
$("#comment-vote-up-link-for-<%= @comment.id %>").show();
$("#comment-vote-down-link-for-<%= @comment.id %>").show();
$("#comment-unvote-link-for-<%= @comment.id %>").hide();

5
app/views/comment_votes/destroy.json.erb
View File

@@ -1,5 +0,0 @@
<% if @error %>
{"success": false, "reason": <%= @error.to_s.to_json.html_safe %>}
<% else %>
{"success": true}
<% end %>

6
app/views/comment_votes/destroy.xml.erb
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<% if @error %>
<response success="false"><%= @error.to_s %></response>
<% else %>
<response success="true"/>
<% end %>