From: Benjamin Mako Hill <mako@ephesus.xvm.mit.edu>
Date: Sun, 17 Jun 2012 22:46:32 +0000 (-0400)
Subject: fix bug/typo in plurality results around candidate.id and candidate_id
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/c4072579c6b3e80d8f05768a9a68bc9ad7490b3c?ds=inline;hp=19a1975ef6170d77997da210512b370cc883af64

fix bug/typo in plurality results around candidate.id and candidate_id
---

diff --git a/app/models/election.rb b/app/models/election.rb
index 9ce89b9..7c15dcf 100644
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -141,11 +141,11 @@ class Election < ActiveRecord::Base
       # skip if the voter has not voted or has an unconfirmed vote
       next unless voter.voted?
 
-      plurality_tally << voter.vote.rankings.sort[0].candidate.id
+      plurality_tally << voter.vote.rankings.sort[0].candidate_id
       approval_tally << voter.vote.rankings.sort[0..1].collect \
-        { |ranking| ranking.candidate.id }
+        { |ranking| ranking.candidate_id }
       preference_tally << voter.vote.rankings.sort.collect \
-        { |ranking| ranking.candidate.id }
+        { |ranking| ranking.candidate_id }
     end
     
     @plurality_result = PluralityVote.new(plurality_tally).result