deblan/journalduhacker
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix pulling vote for current story when showing a specific comment

Browse source
This commit is contained in:
joshua stein 2012-10-10 17:29:02 -05:00
parent d64c0d95c1
commit a2b034ea36
1 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
app/controllers/stories_controller.rb
View file

@ -117,19 +117,7 @@ class StoriesController < ApplicationController
@user ? @user : nil)
@comment = Comment.new
if @user
if v = Vote.find_by_user_id_and_story_id_and_comment_id(@user.id,
@story.id, nil)
@story.vote = v.vote
end
@votes = Vote.comment_votes_by_user_for_story_hash(@user.id, @story.id)
@comments.each do |c|
if @votes[c.id]
c.current_vote = @votes[c.id]
end
end
end
load_user_votes
end
def show_comment
@ -155,19 +143,8 @@ class StoriesController < ApplicationController
end
@comment = Comment.new
if @user
if v = Vote.find_by_user_id_and_story_id(@user.id, @story.id)
@story.vote = v.vote
end
@votes = Vote.comment_votes_by_user_for_story_hash(@user.id, @story.id)
@comments.each do |c|
if @votes[c.id]
c.current_vote = @votes[c.id]
end
end
end
load_user_votes
render :action => "show"
end
@ -255,4 +232,20 @@ private
return false
end
end
def load_user_votes
if @user
if v = Vote.find_by_user_id_and_story_id_and_comment_id(@user.id,
@story.id, nil)
@story.vote = v.vote
end
@votes = Vote.comment_votes_by_user_for_story_hash(@user.id, @story.id)
@comments.each do |c|
if @votes[c.id]
c.current_vote = @votes[c.id]
end
end
end
end
end