updated README with new git repository home

[selectricity] / app / models / election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index 9ce89b9b6baae86009ebc4b7ebdaef096e4dd970..7c15dcfcd785298c1e524702801d69fdfd4f3147 100644 (file)
--- 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?
 
       # 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 \
       approval_tally << voter.vote.rankings.sort[0..1].collect \

-        { |ranking| ranking.candidate.id }
+        { |ranking| ranking.candidate_id }

       preference_tally << voter.vote.rankings.sort.collect \
       preference_tally << voter.vote.rankings.sort.collect \

-        { |ranking| ranking.candidate.id }
+        { |ranking| ranking.candidate_id }

     end
     
     @plurality_result = PluralityVote.new(plurality_tally).result
     end
     
     @plurality_result = PluralityVote.new(plurality_tally).result