refactors voted debates

This commit is contained in:
rgarcia
2015-08-15 14:57:41 +02:00
parent 4751954377
commit 9f2d60c4ce
7 changed files with 73 additions and 24 deletions

View File

@@ -37,7 +37,7 @@ class ApplicationController < ActionController::Base
end
end
def set_voted_values(debates_ids)
@voted_values = current_user ? current_user.votes_on_debates(debates_ids) : {}
def set_debate_votes(debates)
@voted_values = current_user ? current_user.debate_votes(debates) : {}
end
end

View File

@@ -3,17 +3,12 @@ class DebatesController < ApplicationController
load_and_authorize_resource
def index
if params[:tag]
@debates = Debate.tagged_with(params[:tag]).order(id: :desc)
set_voted_values @debates.map(&:id)
else
@debates = Debate.all.order(id: :desc)
set_voted_values @debates.map(&:id)
end
@debates = Debate.search(params)
set_debate_votes(@debates)
end
def show
set_voted_values [@debate.id]
set_debate_votes(@debate)
end
def new
@@ -40,7 +35,7 @@ class DebatesController < ApplicationController
def vote
@debate.vote_by(voter: current_user, vote: params[:value])
set_voted_values [@debate.id]
set_debate_votes(@debate)
end

View File

@@ -2,8 +2,8 @@ class WelcomeController < ApplicationController
skip_authorization_check
def index
@featured_debates = Debate.order("created_at DESC").limit(9)
set_voted_values @featured_debates.map(&:id)
@featured_debates = Debate.limit(9)
set_debate_votes(@featured_debates)
end
end