X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/3c50454cc2031d8996c099ef3a0ff510ffdc299c..323c280a38e4154740639162969b427545678005:/app/models/quick_vote.rb?ds=inline

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index 5f566c6..0efb574 100644
--- a/app/models/quick_vote.rb
+++ b/app/models/quick_vote.rb
@@ -10,12 +10,16 @@ class QuickVote < Election
   attr_accessor :borda_result
 
   def validate
-    if @raw_candidates.length < 2
-      errors.add("You must list at least two candidates.")
+    if not @raw_candidates or @raw_candidates.length < 2
+        errors.add(nil, "You must list at least two candidates.")
     end
-
+    
     if name =~ /[^A-Za-z0-9]/
-      errors.add("The name must only include numbers and letters.")
+      errors.add(:name, "must only include numbers and letters.")
+    end
+    
+    if name =~ /^(create|index|confirm|change|results)$/
+      errors.add(:name, " is a reserved word.")
     end
   end
   
@@ -40,6 +44,7 @@ class QuickVote < Election
   end
 
   def create_candidates
+    return unless errors.empty?
     @raw_candidates.each do |name|
       candidate = Candidate.new({:name => name})
       self.candidates << candidate
@@ -63,7 +68,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 +76,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