refactors voted debates
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user