X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/3c50454cc2031d8996c099ef3a0ff510ffdc299c..e682e1ecce33417f8410e71bd58d385c47e37c5b:/app/models/quick_vote.rb diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb index 5f566c6..ce4a4fb 100644 --- a/app/models/quick_vote.rb +++ b/app/models/quick_vote.rb @@ -63,7 +63,6 @@ class QuickVote < Election preference_tally << voter.vote.rankings.sort.collect \ { |ranking| ranking.candidate.id } end - @plurality_result = PluralityVote.new(plurality_tally).result @approval_result = ApprovalVote.new(approval_tally).result @condorcet_result = PureCondorcetVote.new(preference_tally).result @@ -72,11 +71,11 @@ class QuickVote < Election #@runoff_result = InstantRunoffVote.new(preference_tally).result #@runoff_results = PluralityVote.new(preference_tally).result - end ### Convert a shortname or id into a QuickVote def self.ident_to_quickvote(ident) + return nil unless ident if ident.match(/^\d+$/) quickvote = QuickVote.find(ident) else