partial fix for #1263 (posts)

This commit is contained in:
Toks
2013-06-29 12:40:51 -04:00
parent b4ffd10357
commit 9bffc081e4
7 changed files with 39 additions and 1 deletions

View File

@@ -143,6 +143,8 @@
e.preventDefault();
});
$(".unvote-post-link").hide();
}
Danbooru.Post.initialize_post_relationship_previews = function() {

View File

@@ -82,6 +82,13 @@ class PostsController < ApplicationController
render :nothing => true
end
def unvote
@post = Post.find(params[:id])
@post.unvote!
rescue PostVote::Error => x
@error = x
end
private
def tag_query
params[:tags] || (params[:post] && params[:post][:tags])

View File

@@ -650,6 +650,24 @@ class Post < ActiveRecord::Base
raise PostVote::Error.new("You have already voted for this post")
end
end
def unvote!
if can_be_voted_by?(CurrentUser.user)
raise PostVote::Error.new("You have not voted for this post")
else
vote = votes.where("user_id = ?", CurrentUser.user.id).first
if vote.score == 1
Post.update_all("score = score - 1, up_score = up_score - 1", {:id => id})
self.score -= 1
else
Post.update_all("score = score + 1, down_score = down_score + 1", {:id => id})
self.score += 1
end
vote.destroy
end
end
end
module CountMethods

View File

@@ -4,3 +4,5 @@
Danbooru.notice("Vote saved");
$("#score-for-post-<%= @post.id %>").html(<%= @post.score %>);
<% end %>
$("#vote-links-for-post-<%= @post.id %>").hide();
$("#unvote-link-for-post-<%= @post.id %>").show();

View File

@@ -13,7 +13,7 @@
</li>
<li>Source: <%= post_source_tag(post) %></li>
<li>Rating: <%= post.pretty_rating %></li>
<li>Score: <span id="score-for-post-<%= post.id %>"><%= post.score %></span> <% if CurrentUser.is_gold? %>(vote <%= link_to "up", post_votes_path(:post_id => post.id, :score => "up"), :remote => true, :method => :post %>/<%= link_to "down", post_votes_path(:post_id => post.id, :score => "down"), :remote => true, :method => :post %>)<% end %></li>
<li>Score: <span id="score-for-post-<%= post.id %>"><%= post.score %></span> <% if CurrentUser.is_gold? %>(<span id="vote-links-for-post-<%= post.id %>">vote <%= link_to "up", post_votes_path(:post_id => post.id, :score => "up"), :remote => true, :method => :post %>/<%= link_to "down", post_votes_path(:post_id => post.id, :score => "down"), :remote => true, :method => :post %></span><%= link_to "unvote", unvote_post_path(post), :remote => true, :method => :put, :id => "unvote-link-for-post-#{post.id}", :class => "unvote-post-link" %>)<% end %></li>
<li>Favorites: <span id="favcount-for-post-<%= post.id %>"><%= post.fav_count %></span>
<% if CurrentUser.is_gold? %>
<%= link_to "&raquo;".html_safe, "#", :id => "show-favlist-link" %>

View File

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

View File

@@ -154,6 +154,7 @@ Danbooru::Application.routes.draw do
put :revert
put :copy_notes
get :show_seq
put :unvote
end
end
resources :post_appeals