consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renames @voted_values to @debate_votes in controllers

Browse Source
This commit is contained in:
kikito
2015-09-01 13:07:03 +02:00
parent 005fd4c09a
commit 9a071d2ed7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

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

6
app/helpers/votes_helper.rb
View File

@@ -1,7 +1,7 @@
module VotesHelper module VotesHelper
def css_classes_for_debate_vote(voted_values, debate) def css_classes_for_debate_vote(debate_votes, debate)
case voted_values[debate.id] case debate_votes[debate.id]
when true when true
{in_favor: "voted", against: "no-voted"} {in_favor: "voted", against: "no-voted"}
when false when false
@@ -11,4 +11,4 @@ module VotesHelper
end end
end end
end end

4
app/views/debates/_votes.html.erb
View File

@@ -1,4 +1,4 @@
<% voted_classes = css_classes_for_debate_vote(@voted_values, debate) %> <% voted_classes = css_classes_for_debate_vote(@debate_votes, debate) %>
<div class="votes"> <div class="votes">
<div class="in-favor inline-block"> <div class="in-favor inline-block">
<%= link_to vote_debate_path(debate, value: 'yes'), <%= link_to vote_debate_path(debate, value: 'yes'),
@@ -28,4 +28,4 @@
signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %> signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
</div> </div>
<% end %> <% end %>
</div> </div>