Fix broken Plurality vote by removing a type check in RubyVote. TODO: Figure out...

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

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index 6259784bfbaf1bc847ad8e67b6fad04a2722cf45..c427b981d78120d54ee429f8f2ee9280f9f310a9 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,6 +71,16 @@ 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)
+    if ident.match(/^\d+$/)
+      quickvote = QuickVote.find(ident)
+    else
+      quickvote = QuickVote.find_all(["name = ?", ident])[0]
+    end
 
+    return quickvote
   end
 end