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

post votes: fix error handling.

Browse Source 
* Clean up javascript.
* Return HTTP 422 instead of HTTP 500 on "you have already voted for
  this post" errors.
* In json/xml error responses, return the error message in the `message`
  field, not `reason`.
* In json/xml success responses, return the post itself instead of a
  plain `{ success: true }` object.
This commit is contained in:
evazion
2019-08-13 21:30:20 -05:00
parent 00239c4901
commit f6b737103a
7 changed files with 11 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/post_votes/create.js.erb
View File

@@ -1,9 +1,5 @@
<% if @error %>
$(window).trigger("danbooru:notice", "<%= j @error.to_s %>");
<% else %>
$(window).trigger("danbooru:notice", "Vote saved");
$("#score-for-post-<%= @post.id %>").html(<%= @post.score %>);
<% end %>
Danbooru.Utility.notice("Vote saved");
$("#score-for-post-<%= @post.id %>").html(<%= @post.score %>);
$("#vote-links-for-post-<%= @post.id %>").hide();
$("#unvote-link-for-post-<%= @post.id %>").show();

5
app/views/post_votes/create.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/post_votes/create.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 %>

9
app/views/post_votes/destroy.js.erb
View File

@@ -1,8 +1,5 @@
<% if @error %>
$(window).trigger("danbooru:notice", "<%= j @error.to_s %>");
<% else %>
$(window).trigger("danbooru:notice", "Unvoted successfully");
$("#score-for-post-<%= @post.id %>").html(<%= @post.score %>);
<% end %>
Danbooru.Utility.notice("Unvoted successfully");
$("#score-for-post-<%= @post.id %>").html(<%= @post.score %>);
$("#vote-links-for-post-<%= @post.id %>").show();
$("#unvote-link-for-post-<%= @post.id %>").hide();

5
app/views/post_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/post_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 %>