From: John Dong Date: Fri, 17 Aug 2007 21:57:17 +0000 (-0400) Subject: Fix validation of candidate names X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/41db8c20bfa6518cacaf6b3f816fb071fc486374?hp=9086b07aefc0560832373bb4ba30888d8d43f0d6 Fix validation of candidate names --- diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb index fef4ef8..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