Fix crasher when nil is passed to ident_to_quickvote

[selectricity-live] / app / models / quick_vote.rb

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index 5f566c6eb1e6575e1f8f6a7845e67ba21d963c53..ce4a4fb5d3fe1dd142e4db139262c68c5bc6a069 100644 (file)
--- 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