X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/9129a21b28c88064edfcfc8a8fa23a640f29819c..7065ec58c26803b9fbc99476c09c1599996f4cc1:/app/models/election.rb?ds=sidebyside diff --git a/app/models/election.rb b/app/models/election.rb index 08ef1a5..7c15dcf 100644 --- a/app/models/election.rb +++ b/app/models/election.rb @@ -86,7 +86,7 @@ class Election < ActiveRecord::Base end def quickvote? - self.class == 'QuickVote' + self.class == QuickVote end def active? @@ -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