X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/3b4bd99898faa4b3ebdc78b2e5a2e7047c1a6450..14836effd31a54f1ff693f423c062691b4f64768:/app/models/quick_vote.rb?ds=sidebyside

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index ad72717..698dac3 100644
--- a/app/models/quick_vote.rb
+++ b/app/models/quick_vote.rb
@@ -12,9 +12,23 @@ class QuickVote < Election
 
   def validate
     if not @raw_candidates or @raw_candidates.length < 2
-        errors.add(nil, "You must list at least two candidates.")
+      errors.add(nil, "You must list at least two candidates.")
     end
     
+    @raw_candidates.each do |c|
+      unless c.instance_of? String
+        errors.add(nil, "Candidates must be strings")
+        next
+      end
+      c.strip!
+      if c.length == 0
+        errors.add(nil, "Candidate name must not be empty")
+        next
+      end
+    end if @raw_candidates
+
+    errors.add(nil, "Candidates must all be unique") if @raw_candidates and @raw_candidates.uniq!
+
     if name =~ /[^A-Za-z0-9]/
       errors.add(:name, "must only include numbers and letters.")
     end
@@ -88,7 +102,7 @@ class QuickVote < Election
     if ident.match(/^\d+$/)
       quickvote = QuickVote.find(ident)
     else
-      quickvote = QuickVote.find_all(["name = ?", ident])[0]
+      quickvote = QuickVote.find(:all, :conditions => ["name = ?", ident])[0]
     end
 
     return quickvote